spigot-mirror/craftbukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-09-18 21:54:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
durron597 2011-01-05 08:17:34 -05:00
commit 72c378f1d1
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/net/minecraft/server/NetServerHandler.java
View file

@ -419,6 +419,7 @@ implements ICommandListener {
PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_CHAT, player, s); PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_CHAT, player, s);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
s = (new StringBuilder()).append("<").append(event.getPlayer().getName()).append("> ").append(event.getMessage()).toString(); s = (new StringBuilder()).append("<").append(event.getPlayer().getName()).append("> ").append(event.getMessage()).toString();
if (event.isCancelled()) return;
// CraftBukkit stop // CraftBukkit stop
a.info(s); a.info(s);

8
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -87,6 +87,14 @@ public final class CraftServer implements Server {
return new World[] { console.e.getWorld() }; 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() { public ServerConfigurationManager getHandle() {
return server; return server;
} }