Update CraftBukkit to Minecraft 1.4.6

1 files changed, 11 insertions, 10 deletions

diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6b10bfcb..2f200385 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -39,7 +39,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
     private String serverIp;
     private int s = -1;
     // public WorldServer[] worldServer; // CraftBukkit - removed!
-    private ServerConfigurationManagerAbstract t;
+    private PlayerList t;
     private boolean isRunning = true;
     private boolean isStopped = false;
     private int ticks = 0;
@@ -126,6 +126,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
         BlockDispenser.a.a(Item.EXP_BOTTLE, new DispenseBehaviorExpBottle(this));
         BlockDispenser.a.a(Item.POTION, new DispenseBehaviorPotion(this));
         BlockDispenser.a.a(Item.MONSTER_EGG, new DispenseBehaviorMonsterEgg(this));
+        BlockDispenser.a.a(Item.FIREWORKS, new DispenseBehaviorFireworks(this));
         BlockDispenser.a.a(Item.FIREBALL, new DispenseBehaviorFireball(this));
         DispenseBehaviorMinecart dispensebehaviorminecart = new DispenseBehaviorMinecart(this);
 
@@ -537,9 +538,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
 
         // Send timeupdates to everyone, it will get the right time from the world the player is in.
         if (this.ticks % 20 == 0) {
-            for (int i = 0; i < this.getServerConfigurationManager().players.size(); ++i) {
-                EntityPlayer entityplayer = (EntityPlayer) this.getServerConfigurationManager().players.get(i);
-                entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime())); // Add support for per player time
+            for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
+                EntityPlayer entityplayer = (EntityPlayer) this.getPlayerList().players.get(i);
+                entityplayer.playerConnection.sendPacket(new Packet4UpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime())); // Add support for per player time
             }
         }
 
@@ -757,7 +758,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
     }
 
     public String getVersion() {
-        return "1.4.5";
+        return "1.4.6";
     }
 
     public int y() {
@@ -1085,7 +1086,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
     public abstract boolean T();
 
     public boolean getOnlineMode() {
-        return this.onlineMode;
+        return this.server.getOnlineMode(); // CraftBukkit
     }
 
     public void setOnlineMode(boolean flag) {
@@ -1146,12 +1147,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
         return this.isStopped;
     }
 
-    public ServerConfigurationManagerAbstract getServerConfigurationManager() {
+    public PlayerList getPlayerList() {
         return this.t;
     }
 
-    public void a(ServerConfigurationManagerAbstract serverconfigurationmanagerabstract) {
-        this.t = serverconfigurationmanagerabstract;
+    public void a(PlayerList playerlist) {
+        this.t = playerlist;
     }
 
     public void a(EnumGamemode enumgamemode) {
@@ -1186,7 +1187,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
         return 16;
     }
 
-    public static ServerConfigurationManagerAbstract a(MinecraftServer minecraftserver) {
+    public static PlayerList a(MinecraftServer minecraftserver) {
         return minecraftserver.t;
     }
 }