Rebuild patches

Spigot-Server-Patches/0019-Player-affects-spawning-API.patch

@@ -1,14 +1,14 @@
-From 60cb36b88b86ace4deada026a6a4989535ee5706 Mon Sep 17 00:00:00 2001
+From 24cad00cdef7d8d428d6d3bf1002f02e8c468699 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 18 May 2015 17:52:45 -0500
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0fac7c9..8d2b3a1 100644
+index 88e63f7..2a08976 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -61,6 +61,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -60,6 +60,7 @@ public abstract class EntityHuman extends EntityLiving {
      private final GameProfile bH;
      private boolean bI = false;
      public EntityFishingHook hookedFish;
@@ -17,7 +17,7 @@ index 0fac7c9..8d2b3a1 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index fdca016..2a57b24 100644
+index 657585b..c4dcad3 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -430,7 +430,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index fdca016..2a57b24 100644
              if (entityhuman != null) {
                  double d0 = entityhuman.locX - this.locX;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 1680918..eca4679 100644
+index 6004e23..ebd1e36 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -52,7 +52,7 @@ public abstract class MobSpawnerAbstract {
@@ -198,5 +198,5 @@ index 40ee4d3..130dcce 100644
  
      public Player.Spigot spigot()
 -- 
-1.9.5.msysgit.1
+2.4.2.windows.1
 

Spigot-Server-Patches/0030-Player-lookup-improvements.patch

@@ -1,4 +1,4 @@
-From 9640455e349da4b9f1a8ab4e83b0934fa0a41860 Mon Sep 17 00:00:00 2001
+From e01dd7af6587f3df8a610524d8c91d281547c74a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 04:03:56 -0500
 Subject: [PATCH] Player lookup improvements
@@ -13,13 +13,13 @@ By using a map based approach for player lookups, player lookup should
 be consistent in performance regardless of how many players are online.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a88be23..f4f78e8 100644
+index 048509b..8dfe5e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -49,6 +49,31 @@ public abstract class PlayerList {
      private static final SimpleDateFormat g = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
      private final MinecraftServer server;
-     public final List<EntityPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety, public
+     public final List<EntityPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
 +    // PaperSpigot start - Player lookup improvements
 +    public final Map<String, EntityPlayer> playerMap = new java.util.HashMap<String, EntityPlayer>() {
 +        @Override
@@ -115,7 +115,7 @@ index 8be0698..4a908c6 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 421fa76..63c157d 100644
+index 46bc341..b62a6a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -401,7 +401,12 @@ public final class CraftServer implements Server {
@@ -172,5 +172,5 @@ index 3c5d90d..ae75b36 100644
  
      public InetSocketAddress getAddress() {
 -- 
-2.4.1.windows.1
+2.4.2.windows.1
 

Spigot-Server-Patches/0046-Add-ArmorStand-Marker-NBT-API.patch

@@ -1,14 +1,14 @@
-From 730c4aa970ce747e826e3bced65b27bc36bf09a6 Mon Sep 17 00:00:00 2001
+From 9c14cfeecf183a246c29017b115a14bcdb05f2b5 Mon Sep 17 00:00:00 2001
 From: Anonymoose <MrAnonHimself@anon.life>
 Date: Sun, 3 May 2015 17:44:20 -0500
 Subject: [PATCH] Add ArmorStand Marker NBT API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index d4c82c7..6c1447e 100644
+index a0ad85b..bbf313d 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
-@@ -649,7 +649,7 @@ public class EntityArmorStand extends EntityLiving {
+@@ -646,7 +646,7 @@ public class EntityArmorStand extends EntityLiving {
          return (this.datawatcher.getByte(10) & 8) != 0;
      }
  
@@ -17,7 +17,7 @@ index d4c82c7..6c1447e 100644
          byte b0 = this.datawatcher.getByte(10);
  
          if (flag) {
-@@ -661,7 +661,7 @@ public class EntityArmorStand extends EntityLiving {
+@@ -658,7 +658,7 @@ public class EntityArmorStand extends EntityLiving {
          this.datawatcher.watch(10, Byte.valueOf(b0));
      }
  
@@ -48,5 +48,5 @@ index 741b765..591c5a1 100644
 +    // PaperSpigot end
  }
 -- 
-1.9.5.msysgit.1
+2.4.2.windows.1