Merge remote branch 'upstream/master'

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;
     }