From 9571357cce0ce7bcd0c3c92819023f2d07a890e7 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 27 Nov 2016 17:39:16 -0600
Subject: [PATCH] Rebuild patches
---
Spigot-Server-Patches/0005-Timings-v2.patch | 14 +++++++-------
.../0017-Player-affects-spawning-API.patch | 8 ++++----
.../0022-Only-refresh-abilities-if-needed.patch | 6 +++---
.../0037-Add-player-view-distance-API.patch | 6 +++---
.../0049-Add-PlayerInitialSpawnEvent.patch | 6 +++---
.../0068-Complete-resource-pack-API.patch | 8 ++++----
...-health-absorb-values-and-repair-bad-data.patch | 6 +++---
...educedDebugInfo-not-initialized-on-client.patch | 6 +++---
.../0119-Configurable-Player-Collision.patch | 12 ++++++------
.../0125-Implement-PlayerLocaleChangeEvent.patch | 6 +++---
10 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index b26cbf39d8..93ae5a72f3 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 1777378abaf4ce4056089d6feb12035bd7570a85 Mon Sep 17 00:00:00 2001
+From e872080700a37e9e6688fa039bf02cf5325d744c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@@ -969,7 +969,7 @@ index ae427b4..ce3390c 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1002f3d..6cacac5 100644
+index ea2540d..108bb65 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1017,7 +1017,7 @@ index 1002f3d..6cacac5 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5d6cadc..e40268b 100644
+index 5359e8c..04d6355 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@@ -1027,7 +1027,7 @@ index 5d6cadc..e40268b 100644
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-@@ -1165,10 +1166,11 @@ public abstract class PlayerList {
+@@ -1179,10 +1180,11 @@ public abstract class PlayerList {
}
public void savePlayers() {
@@ -1342,7 +1342,7 @@ index 695bb42..6afcf7c 100644
// CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 14543f3..0ddbd2f 100644
+index f4b0871..761c8e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1729,6 +1729,7 @@ public final class CraftServer implements Server {
@@ -1602,7 +1602,7 @@ index 3a95b44..b5efb9c 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 055c907..dc2937f 100644
+index feeaa9a..fbd7df9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1622,7 +1622,7 @@ index 055c907..dc2937f 100644
import org.bukkit.craftbukkit.map.CraftMapView;
import org.bukkit.craftbukkit.map.RenderData;
import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
-@@ -1584,6 +1578,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1586,6 +1580,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}
diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
index ab20ddb94d..30595a157f 100644
--- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From ea184158bdd0f5ef703f5c697c2172c4e9173ca3 Mon Sep 17 00:00:00 2001
+From 40e274b8cc9da2292c708066e4f5206814d82701 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
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 9f115d1..e9757d1 100644
+index a281c8d..f0a673f 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -70,10 +70,10 @@ index 52171a3..3d70c50 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dc2937f..7933963 100644
+index fbd7df9..54542ee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1447,6 +1447,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1449,6 +1449,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
index 29131eb38c..4b653e781f 100644
--- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
@@ -1,14 +1,14 @@
-From 93c4881b3e9fe063686904ee04c600e592ebf918 Mon Sep 17 00:00:00 2001
+From fcbd429b4f06aa4a99c8fd9725b460cc8562b26c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7933963..fa781b7 100644
+index 54542ee..a9c2677 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1171,12 +1171,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1173,12 +1173,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {
diff --git a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
index 7f96c92c3b..962c57b53f 100644
--- a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
@@ -1,4 +1,4 @@
-From 09ca89155a76f70c0a7119cf0495a9352d5de6b5 Mon Sep 17 00:00:00 2001
+From 7aee8c3e09e1bc95ee5d630bf798447c6db3b395 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API
@@ -194,10 +194,10 @@ index ce3390c..5db113c 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fa781b7..e1b04cb 100644
+index a9c2677..4ba6e35 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1460,6 +1460,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().affectsSpawning;
}
diff --git a/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
index 50242e4d1f..eedafb8ecc 100644
--- a/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From ec663ae69ae0571c06d0b99020c30b63b1455223 Mon Sep 17 00:00:00 2001
+From cc06513c3046952af2dc49fb74bb9367649bc6ad Mon Sep 17 00:00:00 2001
From: Steve Anton <anxuiz.nx@gmail.com>
Date: Thu, 3 Mar 2016 00:09:38 -0600
Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,10 +6,10 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
For modifying a player's initial spawn location as they join the server
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e40268b..6e02044 100644
+index 04d6355..954d035 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -101,6 +101,21 @@ public abstract class PlayerList {
+@@ -104,6 +104,21 @@ public abstract class PlayerList {
}
// CraftBukkit end
diff --git a/Spigot-Server-Patches/0068-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0068-Complete-resource-pack-API.patch
index 9e72bda7e8..03bfb9f84c 100644
--- a/Spigot-Server-Patches/0068-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0068-Complete-resource-pack-API.patch
@@ -1,11 +1,11 @@
-From ff06a8ff1eb92a2fb1c58c49ba29a78b93745be4 Mon Sep 17 00:00:00 2001
+From d76ebc3e672482779cc7f5d3210cc8178b31ab74 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2d0e6a1..a6013f2 100644
+index d1c0e70..7105c42 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1010,7 +1010,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,7 +24,7 @@ index 2d0e6a1..a6013f2 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a4ba222..99a7ea6 100644
+index b3084b7..5be1a6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -38,7 +38,7 @@ index a4ba222..99a7ea6 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
-@@ -1564,6 +1568,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1566,6 +1570,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}
diff --git a/Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index dc302a9643..0f6c55dbee 100644
--- a/Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From d1b1fe4fb9ac3c9b87237895bec3008621fca0ef Mon Sep 17 00:00:00 2001
+From b2392134aa1d23f36e9f81352ce09da45ac8023a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -44,10 +44,10 @@ index cc00fde..39609f7 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 99a7ea6..88a19a8 100644
+index 5be1a6f..06e401a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1410,6 +1410,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1412,6 +1412,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setRealHealth(double health) {
diff --git a/Spigot-Server-Patches/0109-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0109-Fix-reducedDebugInfo-not-initialized-on-client.patch
index e664b382c5..735f66784d 100644
--- a/Spigot-Server-Patches/0109-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0109-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,14 +1,14 @@
-From af7876ac4d5a167fa8d7c84d174e842212713975 Mon Sep 17 00:00:00 2001
+From 541545f30a6d54e0ee4893e5800a35589ddd3797 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 20:37:03 -0400
Subject: [PATCH] Fix reducedDebugInfo not initialized on client
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6e02044..99c420a 100644
+index 954d035..87740c2 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -151,6 +151,7 @@ public abstract class PlayerList {
+@@ -154,6 +154,7 @@ public abstract class PlayerList {
playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities));
playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
diff --git a/Spigot-Server-Patches/0119-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0119-Configurable-Player-Collision.patch
index cd39fb3512..b7ff3de41f 100644
--- a/Spigot-Server-Patches/0119-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0119-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 22c3e633549bd6ec3fb29e90a5edc2896c280f6f Mon Sep 17 00:00:00 2001
+From 8f7b249a6de92ce692b7056afcaca278a887184b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 02:10:49 -0400
Subject: [PATCH] Configurable Player Collision
@@ -75,10 +75,10 @@ index d8ec504..eb45d3c 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 99c420a..3c47ea2 100644
+index 87740c2..981c31f 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -68,6 +68,7 @@ public abstract class PlayerList {
+@@ -71,6 +71,7 @@ public abstract class PlayerList {
// CraftBukkit start
private CraftServer cserver;
private final Map<String,EntityPlayer> playersByName = new org.spigotmc.CaseInsensitiveMap<EntityPlayer>();
@@ -86,7 +86,7 @@ index 99c420a..3c47ea2 100644
public PlayerList(MinecraftServer minecraftserver) {
this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
-@@ -233,6 +234,12 @@ public abstract class PlayerList {
+@@ -236,6 +237,12 @@ public abstract class PlayerList {
}
entityplayer.syncInventory();
@@ -99,7 +99,7 @@ index 99c420a..3c47ea2 100644
// CraftBukkit - Moved from above, added world
PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
}
-@@ -403,6 +410,16 @@ public abstract class PlayerList {
+@@ -406,6 +413,16 @@ public abstract class PlayerList {
entityplayer.playerTick();// SPIGOT-924
// CraftBukkit end
@@ -116,7 +116,7 @@ index 99c420a..3c47ea2 100644
this.savePlayerFile(entityplayer);
if (entityplayer.isPassenger()) {
Entity entity = entityplayer.getVehicle();
-@@ -1305,7 +1322,13 @@ public abstract class PlayerList {
+@@ -1319,7 +1336,13 @@ public abstract class PlayerList {
player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
}
// CraftBukkit end
diff --git a/Spigot-Server-Patches/0125-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0125-Implement-PlayerLocaleChangeEvent.patch
index c2c8a91c44..c6c0076266 100644
--- a/Spigot-Server-Patches/0125-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0125-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 6f8815bed9d7566fe1ee56912eac4bae1e635dde Mon Sep 17 00:00:00 2001
+From 2d1c453d99db8e60221d8d31ee8da6b370268c12 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -34,10 +34,10 @@ index feb07a3..83f3317 100644
this.ch = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2eaf502..80b3fba 100644
+index 1a4603d..ffb7341 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1695,7 +1695,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1697,7 +1697,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{