Fix merge conflicts from access transform update.

CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From a5e805949f015b7a803f132a487845e5c34f25b2 Mon Sep 17 00:00:00 2001
+From 5f945d18735c2588742a9ee996276be54f8dd76e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -6,10 +6,10 @@ Subject: [PATCH] Merge tweaks and configuration
 This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 1e575fe..fa7e6df 100644
+index 6243b0e..c1b904d 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
-@@ -123,7 +123,10 @@ public class EntityItem extends Entity {
+@@ -122,7 +122,10 @@ public class EntityItem extends Entity {
      }
  
      private void w() {
@@ -21,7 +21,7 @@ index 1e575fe..fa7e6df 100644
  
          while (iterator.hasNext()) {
              EntityItem entityitem = (EntityItem) iterator.next();
-@@ -157,11 +160,13 @@ public class EntityItem extends Entity {
+@@ -156,11 +159,13 @@ public class EntityItem extends Entity {
                      } else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
                          return false;
                      } else {
@@ -41,7 +41,7 @@ index 1e575fe..fa7e6df 100644
                      }
                  } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c81f673..abc39f1 100644
+index 11e072b..df4d9cd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -970,6 +970,23 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0014-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From 85cee07c274011112875655c5f246974542d17b5 Mon Sep 17 00:00:00 2001
+From 1a625048845e34778ffdba0ad1042370f586a797 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -9,15 +9,15 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d3c7d1b..ebdcaab 100644
+index 0e6a905..687fb4b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -89,14 +89,14 @@ public abstract class Entity implements ICommandListener {
      public int ticksLived;
      public int maxFireTicks;
-     public int fireTicks; // CraftBukkit - public
+     public int fireTicks;
 -    protected boolean inWater;
-+    public boolean inWater; // Spigot - protected -> public
++    public boolean inWater; // Spigot - protected -> public // PAIL
      public int noDamageTicks;
      protected boolean justCreated;
      protected boolean fireProof;
@@ -25,7 +25,7 @@ index d3c7d1b..ebdcaab 100644
      private double ar;
      private double as;
 -    public boolean ad;
-+    public boolean ad; public boolean isAddedToChunk() { return ad; } // Spigot
++    public boolean ad; public boolean isAddedToChunk() { return ad; } // Spigot // PAIL
      public int ae;
      public int af;
      public int ag;
@@ -93,7 +93,7 @@ index 8a74059..09d4335 100644
          super(world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index d0e5f11..01c66e3 100644
+index 04863b3..3359160 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -15,7 +15,7 @@ public class EntityArrow extends Entity implements IProjectile {
@@ -107,7 +107,7 @@ index d0e5f11..01c66e3 100644
      public Entity shooter;
 @@ -24,6 +24,18 @@ public class EntityArrow extends Entity implements IProjectile {
      private double damage = 2.0D;
-     public int knockbackStrength; // CraftBukkit - public
+     public int knockbackStrength;
  
 +    // Spigot Start
 +    @Override
@@ -125,12 +125,12 @@ index d0e5f11..01c66e3 100644
          super(world);
          this.j = 10.0D;
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 607608f..02f1603 100644
+index aa36bf2..3c7814d 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -5,6 +5,15 @@ public class EntityFireworks extends Entity {
      private int ticksFlown;
-     public int expectedLifespan; // CraftBukkit - public
+     public int expectedLifespan;
  
 +    // Spigot Start
 +    @Override
@@ -145,10 +145,10 @@ index 607608f..02f1603 100644
          super(world);
          this.setSize(0.25F, 0.25F);
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fa7e6df..65a03df 100644
+index c1b904d..06d4687 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
-@@ -122,6 +122,28 @@ public class EntityItem extends Entity {
+@@ -121,6 +121,28 @@ public class EntityItem extends Entity {
          }
      }
  
@@ -178,7 +178,7 @@ index fa7e6df..65a03df 100644
          // Spigot start
          double radius = world.spigotConfig.itemMerge;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0638f6f..f7ce391 100644
+index 6ef9c83..e3a9e44 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,6 +89,13 @@ public abstract class EntityLiving extends Entity {
@@ -196,7 +196,7 @@ index 0638f6f..f7ce391 100644
      public void G() {
          this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 380df75..f82c0f9 100644
+index 6de46dc..221e2f2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1306,6 +1306,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0043-Item-Despawn-Rate.patch

@@ -1,14 +1,14 @@
-From 9a04698dd3ec6d937551e7b7e35d34e68b9fae1e Mon Sep 17 00:00:00 2001
+From b07858f888ce0ba99638644fecc8aea78532c0f8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 65a03df..d6d83fe 100644
+index 06d4687..0b0f027 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
-@@ -109,7 +109,7 @@ public class EntityItem extends Entity {
+@@ -108,7 +108,7 @@ public class EntityItem extends Entity {
  
  
              this.W();

CraftBukkit-Patches/0055-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 9919455a6939de744d08eb063e10ba966448d67a Mon Sep 17 00:00:00 2001
+From d11077745ee7745fd26ebd7d5b2d84d3ffe9a96d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
 Provides support for IP forwarding via BungeeCord.
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d0374d0..8a6ef45 100644
+index fcfdb65..974779c 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -7,6 +7,7 @@ import java.util.HashMap;
@@ -102,15 +102,15 @@ index 1fa9626..541cec7 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index cd67d2b..54298b4 100644
+index 7623b42..7959242 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -64,7 +64,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
      private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
      private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
-     public Channel channel;  // CraftBukkit - public
+     public Channel channel;
 -    private SocketAddress l;
-+    // Spigot Start
++    // Spigot Start // PAIL
 +    public SocketAddress l;
 +    public java.util.UUID spoofedUUID;
 +    public com.mojang.authlib.properties.Property[] spoofedProfile;
@@ -144,7 +144,7 @@ index a1c5869..c91a695 100644
          this.d = EnumProtocol.a(packetdataserializer.e());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 665d58e..0dcf37e 100644
+index 9f8750b..30a8ddc 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {

CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch

@@ -1,18 +1,18 @@
-From ded6753e6d24ed3df37cd9a82f4172714a2f1536 Mon Sep 17 00:00:00 2001
+From c3cc0f09b0bcc0b21478def0b640d8df972bfebe Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:33:36 +1100
 Subject: [PATCH] Use Standard List for EntitySlices.
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f8bfc2d..d5922fe 100644
+index 994903f..022ba31 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -31,7 +31,7 @@ public class Chunk {
      public final int locZ;
      private boolean k;
      public final Map<BlockPosition, TileEntity> tileEntities;
--    public final EntitySlice<Entity>[] entitySlices; // CraftBukkit - public
+-    public final EntitySlice<Entity>[] entitySlices;
 +    public final List<Entity>[] entitySlices; // Spigot
      private boolean done;
      private boolean lit;