summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordurron597 <martin.jared@gmail.com>2011-01-05 08:17:34 -0500
committerdurron597 <martin.jared@gmail.com>2011-01-05 08:17:34 -0500
commit72c378f1d1974179a02a432b820e97802fc0f13b (patch)
tree2121b2f8eec309af7cfa27e806bcdb5350928912 /src
parentb73e343dc18a341f3cb832b9f9b6588dbf91b053 (diff)
parent786488603efdc6da423cbf3fdd1d7e7372fa4497 (diff)
downloadcraftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar
craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar.gz
craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar.lz
craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar.xz
craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java1
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java8
2 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 7cfe5ff5..2fd1c49f 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -419,6 +419,7 @@ implements ICommandListener {
PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_CHAT, player, s);
server.getPluginManager().callEvent(event);
s = (new StringBuilder()).append("<").append(event.getPlayer().getName()).append("> ").append(event.getMessage()).toString();
+ if (event.isCancelled()) return;
// CraftBukkit stop
a.info(s);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 216a26b6..b8acb6c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -87,6 +87,14 @@ public final class CraftServer implements Server {
return new World[] { console.e.getWorld() };
}
+ public long getTime() {
+ return console.e.e;
+ }
+
+ public void setTime(long time) {
+ console.e.e = time;
+ }
+
public ServerConfigurationManager getHandle() {
return server;
}