Fix some merge conflicts

CraftBukkit-Patches/0024-Enable-Improved-Ping-Sending.patch

@@ -1,26 +1,26 @@
-From 32b6c581167f920505e53027652b245c09997ba1 Mon Sep 17 00:00:00 2001
+From 92495f9ed485c619523e3d5e4be1d122b590e6a3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d90ddb7..35284cf 100644
+index 8d98a70..4c06a42 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -61,6 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public int newTotalExp = 0;
      public boolean keepLevel = false;
      public double maxHealthCache;
+     public boolean joining = true;
 +    public int lastPing = -1; // Spigot
      // CraftBukkit end
  
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1943dbf..9f31630 100644
+index 5b0590e..8b3d757 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -775,6 +775,25 @@ public abstract class PlayerList {
+@@ -779,6 +779,25 @@ public abstract class PlayerList {
              this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
          }
          // CraftBukkit end */
@@ -47,5 +47,5 @@ index 1943dbf..9f31630 100644
  
      public void sendAll(Packet packet) {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch

@@ -1,4 +1,4 @@
-From 73b525dd39781dca706193081dc4abd689c59ba9 Mon Sep 17 00:00:00 2001
+From 2fb681c8b6ec9f26b4a3f43de21e39dc1b44e316 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
 Prevents server hanging if players disconnect during the shutdown sequence.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index fa3e65c..b6a3d2b 100644
+index 8b3d757..794bedd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1125,8 +1125,15 @@ public abstract class PlayerList {
+@@ -1129,8 +1129,15 @@ public abstract class PlayerList {
      }
  
      public void r() {

CraftBukkit-Patches/0037-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 1929ca5d2796b16a152090ee693b0638134aa7cd Mon Sep 17 00:00:00 2001
+From 19bcdf0bb0665520903b444611f8ea6ac1aeabe5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -23,10 +23,10 @@ index e5992f8..b80a760 100644
                  this.b.close(chatcomponenttext);
              } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6454f8f..6fe8ca5 100644
+index 794bedd..461049e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -335,7 +335,7 @@ public abstract class PlayerList {
+@@ -339,7 +339,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
          } else if (!this.isWhitelisted(gameprofile.getName())) {
              // return "You are not white-listed on this server!";
@@ -35,7 +35,7 @@ index 6454f8f..6fe8ca5 100644
          } else {
              String s1 = socketaddress.toString();
  
-@@ -354,7 +354,7 @@ public abstract class PlayerList {
+@@ -358,7 +358,7 @@ public abstract class PlayerList {
              } else {
                  // return this.players.size() >= this.maxPlayers ? "The server is full!" : null;
                  if (this.players.size() >= this.maxPlayers) {
@@ -103,5 +103,5 @@ index 8764045..0ab2ec3 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0044-Prevent-Ghost-Players-Caused-by-Plugins.patch

@@ -1,4 +1,4 @@
-From 0c86513c681cea01a8130302d9836f82eaeb7038 Mon Sep 17 00:00:00 2001
+From 670d2593f6ace36c0802b3f46add4a1adbbf7b4a Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d116e5..2ff1e19 100644
+index 461049e..a2599ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -467,6 +467,11 @@ public abstract class PlayerList {
+@@ -471,6 +471,11 @@ public abstract class PlayerList {
              Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
              PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
              this.cserver.getPluginManager().callEvent(respawnEvent);

CraftBukkit-Patches/0047-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 2c62c137eb219eb4e1250e4bbda2dd91c4ec4cc2 Mon Sep 17 00:00:00 2001
+From c8e14405ce9b28101adaa15d95495fbed43b5eda Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -31,11 +31,11 @@ index 57157ef..c04ff95 100644
                  Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 35284cf..e8756ed 100644
+index 4c06a42..bd18f4d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -63,6 +63,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -64,6 +64,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public double maxHealthCache;
+     public boolean joining = true;
      public int lastPing = -1; // Spigot
      // CraftBukkit end
 +    // Spigot start
@@ -75,5 +75,5 @@ index 07c8a2c..296e20a 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0082-Update-Chest-Animation-when-Cancelling-Event.patch

@@ -1,4 +1,4 @@
-From ef95f91c929c37c03bc09d142936b802d471e007 Mon Sep 17 00:00:00 2001
+From c0ace7dda07e969ac697835c14abe346e996607d Mon Sep 17 00:00:00 2001
 From: bloodshot <jdroque@gmail.com>
 Date: Mon, 6 Jan 2014 16:29:51 -0500
 Subject: [PATCH] Update Chest Animation when Cancelling Event
@@ -13,10 +13,10 @@ More info can be found here
 https://bukkit.atlassian.net/browse/BUKKIT-1440
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e8756ed..b8c3540 100644
+index bd18f4d..d749254 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -622,7 +622,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -629,7 +629,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerChest(this.inventory, iinventory));
@@ -28,7 +28,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -635,7 +638,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -642,7 +645,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openHopper(TileEntityHopper tileentityhopper) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, tileentityhopper));
@@ -40,7 +40,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -648,7 +654,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -655,7 +661,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openMinecartHopper(EntityMinecartHopper entityminecarthopper) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, entityminecarthopper));
@@ -52,7 +52,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -661,7 +670,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -668,7 +677,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openFurnace(TileEntityFurnace tileentityfurnace) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerFurnace(this.inventory, tileentityfurnace));
@@ -64,7 +64,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -674,7 +686,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -681,7 +693,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openDispenser(TileEntityDispenser tileentitydispenser) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerDispenser(this.inventory, tileentitydispenser));
@@ -76,7 +76,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -687,7 +702,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -694,7 +709,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openBrewingStand(TileEntityBrewingStand tileentitybrewingstand) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBrewingStand(this.inventory, tileentitybrewingstand));
@@ -88,7 +88,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -700,7 +718,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -707,7 +725,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openBeacon(TileEntityBeacon tileentitybeacon) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBeacon(this.inventory, tileentitybeacon));
@@ -100,7 +100,7 @@ index e8756ed..b8c3540 100644
          // CraftBukkit end
  
          this.nextContainerCounter();
-@@ -743,7 +764,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -750,7 +771,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openHorseInventory(EntityHorse entityhorse, IInventory iinventory) {
          // CraftBukkit start - Inventory open hook
          Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHorse(this.inventory, iinventory, entityhorse));
@@ -113,5 +113,5 @@ index e8756ed..b8c3540 100644
  
          if (this.activeContainer != this.defaultContainer) {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0100-Allow-Configuring-Chunks-per-Packet.patch

@@ -1,14 +1,14 @@
-From 920472922c16c6e762e3fe48c102cd3f4e17aba1 Mon Sep 17 00:00:00 2001
+From cf581b8daf7b5d52b0b12fea8e25ac60a83efe01 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b8c3540..f01d798 100644
+index d749254..4ad2eeb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -202,7 +202,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -209,7 +209,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
              Chunk chunk;
  
@@ -34,5 +34,5 @@ index ffdb33e..1290829 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0110-Unfinalize-the-isDisconnected-method-by-bukkit.patch

@@ -1,4 +1,4 @@
-From 1014e7b0cb8a6166b14ed4343d6bfda56fb14cd4 Mon Sep 17 00:00:00 2001
+From f78a24b5f6db5880964917c9d66605f1754e7b27 Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,7 +6,7 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 60d0f54..3d03320 100644
+index eb5b84e..ed144b5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1892,7 +1892,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -15,9 +15,9 @@ index 60d0f54..3d03320 100644
      // CraftBukkit start - Add "isDisconnected" method
 -    public final boolean isDisconnected() {
 +    public boolean isDisconnected() {
-         return !NetworkManager.a(this.networkManager).config().isAutoRead();
+         return !this.player.joining && !NetworkManager.a(this.networkManager).config().isAutoRead();
      }
      // CraftBukkit end
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0118-Optimize-Player-Lookup.patch

@@ -1,4 +1,4 @@
-From 634e80d14c3e6eac422e23b0b94402fbb8add174 Mon Sep 17 00:00:00 2001
+From fe37c8f84144ee7226e7e5f44a3e8a4f826af8c8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 15 Mar 2014 14:34:03 +1100
 Subject: [PATCH] Optimize Player Lookup
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Player Lookup
 Optimize player lookup and various player operations. We mainly do this by keeping a map instead of iterating through all players. We also speed up the duplicate login check and a few other checks by simply checking for one matching player.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2afea17..aef80bd 100644
+index a2599ec..77b6193 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -56,6 +56,25 @@ public abstract class PlayerList {
@@ -35,7 +35,7 @@ index 2afea17..aef80bd 100644
      // CraftBukkit start
      private CraftServer cserver;
  
-@@ -218,6 +237,7 @@ public abstract class PlayerList {
+@@ -222,6 +241,7 @@ public abstract class PlayerList {
          cserver.detectListNameConflict(entityplayer); // CraftBukkit
          // this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, 1000)); // CraftBukkit - replaced with loop below
          this.players.add(entityplayer);
@@ -43,7 +43,7 @@ index 2afea17..aef80bd 100644
          WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
  
          // CraftBukkit start
-@@ -292,6 +312,7 @@ public abstract class PlayerList {
+@@ -296,6 +316,7 @@ public abstract class PlayerList {
          worldserver.kill(entityplayer);
          worldserver.getPlayerChunkMap().removePlayer(entityplayer);
          this.players.remove(entityplayer);
@@ -51,7 +51,7 @@ index 2afea17..aef80bd 100644
          this.j.remove(entityplayer.getName());
          ChunkIOExecutor.adjustPoolSize(this.getPlayerCount()); // CraftBukkit
  
-@@ -370,23 +391,14 @@ public abstract class PlayerList {
+@@ -374,23 +395,14 @@ public abstract class PlayerList {
      }
  
      public EntityPlayer processLogin(GameProfile gameprofile, EntityPlayer player) { // CraftBukkit - added EntityPlayer
@@ -81,7 +81,7 @@ index 2afea17..aef80bd 100644
  
          /* CraftBukkit start
          Object object;
-@@ -882,19 +894,7 @@ public abstract class PlayerList {
+@@ -886,19 +898,7 @@ public abstract class PlayerList {
      }
  
      public EntityPlayer getPlayer(String s) {
@@ -183,5 +183,5 @@ index fa51a4c..0895491 100644
  
      public InetSocketAddress getAddress() {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2