From 066f383b951f9d82a83e77b554d18bd845701678 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 May 2017 23:25:17 -0500 Subject: [PATCH] Update upstream B/CB/S --- Spigot-API-Patches/0003-Timings-v2.patch | 6 ++-- .../0004-Player-affects-spawning-API.patch | 8 ++--- .../0009-Add-PlayerLocaleChangeEvent.patch | 11 ++++--- .../0010-Add-player-view-distance-API.patch | 6 ++-- .../0022-Complete-resource-pack-API.patch | 6 ++-- ...0043-Add-String-based-Action-Bar-API.patch | 8 ++--- Spigot-Server-Patches/0006-Timings-v2.patch | 10 +++--- ...ient-crashes-server-lists-and-Mojang.patch | 4 +-- .../0017-Player-affects-spawning-API.patch | 21 ++++++------ ...021-Only-refresh-abilities-if-needed.patch | 8 ++--- .../0029-Configurable-end-credits.patch | 8 ++--- .../0036-Add-player-view-distance-API.patch | 12 +++---- ...figurable-container-update-tick-rate.patch | 10 +++--- .../0055-Player-Tab-List-and-Title-APIs.patch | 6 ++-- ...x-inter-world-teleportation-glitches.patch | 8 ++--- .../0065-Complete-resource-pack-API.patch | 10 +++--- ...th-absorb-values-and-repair-bad-data.patch | 10 +++--- ...nd-for-setting-passengers-on-players.patch | 8 ++--- ...18-Implement-PlayerLocaleChangeEvent.patch | 33 ++++++++++++------- ...ers-that-dismount-from-other-players.patch | 8 ++--- .../0156-Auto-Save-Improvements.patch | 8 ++--- ...uto-fix-bad-Y-levels-on-player-login.patch | 8 ++--- .../0171-Optimise-removeQueue.patch | 10 +++--- .../0186-IllegalPacketEvent.patch | 14 ++++---- ...87-Properly-fix-item-duplication-bug.patch | 10 +++--- .../0188-String-based-Action-Bar-API.patch | 8 ++--- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 29 files changed, 140 insertions(+), 125 deletions(-) diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 7018e644b0..2a4a7e8342 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 9437b8d896c01fa3e5ceb0f1b1940a119662dab3 Mon Sep 17 00:00:00 2001 +From 641ad825cfd307896323c7de8fccada29951328b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3457,10 +3457,10 @@ index a8f61f2d..00000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 70eb5eec..845c3670 100644 +index bd2cc354..d2a78f56 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1505,6 +1505,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1520,6 +1520,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index 9db8463478..b5531fb6d9 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,16 +1,16 @@ -From c298dda1b017443cf4d79d4f169344eb68b6c9c0 Mon Sep 17 00:00:00 2001 +From a4b6a1c41d153da1b0abb5c370ba6bac5ad62b86 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 845c3670..95880585 100644 +index d2a78f56..e429e701 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1402,6 +1402,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1415,6 +1415,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ - public AdvancementProgress getAdvancementProgress(Advancement advancement); + public String getLocale(); + /** + * Get whether the player can affect mob spawning diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index 96dbbb26d1..d98baa00cd 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 5bbfd17e10b92832b0459da91bb1044c3eb38f17 Mon Sep 17 00:00:00 2001 +From c05775d4577ba7f7af96d9cb1328fb26319b68aa Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent @@ -6,10 +6,10 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java new file mode 100644 -index 0000000..17afc8c +index 00000000..29dd763a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java -@@ -0,0 +1,47 @@ +@@ -0,0 +1,50 @@ +package com.destroystokyo.paper.event.player; + +import org.bukkit.entity.Player; @@ -18,7 +18,10 @@ index 0000000..17afc8c + +/** + * Called when the locale of the player is changed. ++ * ++ * @deprecated Replaced by {@link org.bukkit.event.player.PlayerLocaleChangeEvent} upstream + */ ++@Deprecated +public class PlayerLocaleChangeEvent extends PlayerEvent { + private static final HandlerList handlers = new HandlerList(); + private final String oldLocale; @@ -58,5 +61,5 @@ index 0000000..17afc8c + } +} -- -2.8.0 +2.13.0.windows.1 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index fa9b8e7755..787ef8e102 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From 4f3ce608d96482d1906ba64fdcd596f590dfd5d1 Mon Sep 17 00:00:00 2001 +From 50f65fe293c945c2cdfb52ca3bdf07c422f54423 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 95880585..eb738db0 100644 +index e429e701..7fcc7aea 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1416,6 +1416,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1429,6 +1429,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setAffectsSpawning(boolean affects); diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch index ec44d9d41d..c00905fbbe 100644 --- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 82ad6d3aa0c24c2bc3fe2bb0e91f49f156d297bf Mon Sep 17 00:00:00 2001 +From 30c7e1eb9b2001b9dbe9ee911896660c67b63eda Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2c8b46cc..481c39a6 100644 +index 1fc83b57..f04e2541 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1185,7 +1185,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -18,7 +18,7 @@ index 2c8b46cc..481c39a6 100644 public void setResourcePack(String url); /** -@@ -1573,6 +1575,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1586,6 +1588,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setViewDistance(int viewDistance); diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch index 82b8eb90a4..8a538fa2d9 100644 --- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 30d5e1620c4b712a5a2da06242ad30f5b02256be Mon Sep 17 00:00:00 2001 +From c1f59bafd368616b4cbf133847cb243aeedafe46 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 481c39a6..1afdde07 100644 +index f04e2541..72c85452 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -47,7 +47,7 @@ index 481c39a6..1afdde07 100644 public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } -@@ -1713,9 +1735,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1728,9 +1750,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends the component to the specified screen position of this player * @@ -59,7 +59,7 @@ index 481c39a6..1afdde07 100644 public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1723,9 +1747,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1738,9 +1762,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends an array of components as a single message to the specified screen position of this player * diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 50e688bf20..3c0ab80c70 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 0c4f7de4d02fd827578c1a3d619e404ec588f49f Mon Sep 17 00:00:00 2001 +From c38af80b4c744cd4877516ef69de70fe34f6360c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -1012,7 +1012,7 @@ index eeac34998..e4ed2e991 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3bcabb195..7c4fe706a 100644 +index fb5eefc11..9eaa3a2ac 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; @@ -1677,10 +1677,10 @@ index 3a95b4465..b5efb9c3f 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 39a6bc220..06f33f80e 100644 +index c019e5229..d10177669 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -39,7 +39,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; +@@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ManuallyAbandonedConversationCanceller; @@ -1689,7 +1689,7 @@ index 39a6bc220..06f33f80e 100644 import org.bukkit.craftbukkit.block.CraftSign; import org.bukkit.craftbukkit.conversations.ConversationTracker; import org.bukkit.craftbukkit.CraftEffect; -@@ -1587,6 +1587,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1591,6 +1591,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } diff --git a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index b6921c1ae0..abc27977db 100644 --- a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 61715ac730b754353b7b65ad96ba42a2fcae59b7 Mon Sep 17 00:00:00 2001 +From 40a8654adb652f624440c582b5a53550744a159a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -54,7 +54,7 @@ index 30b6f3477..22cb680df 100644 Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -3); -+ deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 14 ++ deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 14, this is pre-release anyway if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch index 226e3cd8e6..4ab602b563 100644 --- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 24fe6438b0705833454275e38f9d629102337881 Mon Sep 17 00:00:00 2001 +From 5f6d630fe3b1899af917a1e947075da6b44c693c Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -70,13 +70,16 @@ index 6b404e385..3d114cfea 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 06f33f80e..6f042b620 100644 +index d10177669..4f80d0443 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1456,6 +1456,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - return new CraftAdvancementProgress(craft, data, progress); - } - +@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + @Override + public String getLocale() { + return getHandle().locale; ++ ++ } ++ + public void setAffectsSpawning(boolean affects) { + this.getHandle().affectsSpawning = affects; + } @@ -84,11 +87,9 @@ index 06f33f80e..6f042b620 100644 + @Override + public boolean getAffectsSpawning() { + return this.getHandle().affectsSpawning; -+ } -+ + } + // Spigot start - private final Player.Spigot spigot = new Player.Spigot() - { -- 2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch index 4196875cab..1df309186e 100644 --- a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch @@ -1,14 +1,14 @@ -From a84b405e20bf60222b6a5f9608c84a3918686512 Mon Sep 17 00:00:00 2001 +From 63bffaf28a488fabf6686ffa189e2412c163e9c6 Mon Sep 17 00:00:00 2001 From: Zach Brown 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 c5924a2be..94cca69a4 100644 +index 4f80d0443..b451be916 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1161,12 +1161,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1160,12 +1160,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setFlying(boolean value) { @@ -24,5 +24,5 @@ index c5924a2be..94cca69a4 100644 @Override -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch index 49f9e226f0..6f1e3a1170 100644 --- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From 2c7e1cdf4a07b72caa2816f666edd159c9662141 Mon Sep 17 00:00:00 2001 +From f797679452ee445be2471755636f140cd3688c13 Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -20,10 +20,10 @@ index fd606ee14..c00fa83d5 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a6f70d846..8b0c126a3 100644 +index 0d16f65c8..9a5b8f083 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -56,7 +56,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -57,7 +57,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { private long cn = System.currentTimeMillis(); private Entity co; public boolean worldChangeInvuln; @@ -32,7 +32,7 @@ index a6f70d846..8b0c126a3 100644 private final RecipeBookServer cr = new RecipeBookServer(); private Vec3D cs; private int ct; -@@ -603,6 +603,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -604,6 +604,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.world.kill(this); if (!this.viewingCredits) { this.viewingCredits = true; diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch index 260d34998c..daac4ebe57 100644 --- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From a3a19d58d3ed3baa6550ad32073c2478eba08ef7 Mon Sep 17 00:00:00 2001 +From c70ff5f64d1980e151179042c3d8b10b512da6a1 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 586c4ad0d..1a5e5d944 100644 +index 9a5b8f083..a8038881d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -67,6 +67,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public boolean f; public int ping; public boolean viewingCredits; @@ -194,10 +194,10 @@ index e4ed2e991..cfac05750 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 94cca69a4..efcf383e7 100644 +index b451be916..3c39751a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1466,6 +1466,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1471,6 +1471,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().affectsSpawning; } @@ -215,5 +215,5 @@ index 94cca69a4..efcf383e7 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch index 0e52b1a298..100c47dd73 100644 --- a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch @@ -1,4 +1,4 @@ -From 9f3c6605d96924c379901e55a92da9afe5aa0fbf Mon Sep 17 00:00:00 2001 +From 4e403d7a2bd2d0fd6da83dab1e55fed43e9b38da Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate @@ -19,10 +19,10 @@ index 1bb956515..e6aae7317 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 1a5e5d944..42f6b7206 100644 +index a8038881d..6fdde5c07 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.viewDistance = viewDistance; } // Paper end @@ -30,7 +30,7 @@ index 1a5e5d944..42f6b7206 100644 // CraftBukkit start public String displayName; -@@ -266,7 +267,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -267,7 +268,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { --this.noDamageTicks; } @@ -45,5 +45,5 @@ index 1a5e5d944..42f6b7206 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch index eb73f71ba1..08cfdf9a47 100644 --- a/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 757684a009e33a1bb24e2b7f71e0bed8fc007870 Mon Sep 17 00:00:00 2001 +From 58fc9099d5c386c8fe598eccbccbbd4df1da0e38 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 21c729026..a7e011404 100644 +index 3c39751a0..fe40c51a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -88,7 +88,7 @@ index 21c729026..a7e011404 100644 import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.io.BaseEncoding; -@@ -166,6 +167,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -165,6 +166,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } } diff --git a/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch index f90dee74a0..7dab6c3f08 100644 --- a/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch +++ b/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch @@ -1,4 +1,4 @@ -From 7c20e7de295ba750b809d3069615637e6d5d337c Mon Sep 17 00:00:00 2001 +From 2d6cd8264050283d165c92ead582c3b97bc1f74b Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Fix inter-world teleportation glitches @@ -25,10 +25,10 @@ index 4cc74cd65..fa49397ea 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b1c06388b..cf753d362 100644 +index fe40c51a4..eb7bdd222 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -587,7 +587,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -586,7 +586,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (fromWorld == toWorld) { entity.playerConnection.teleport(to); } else { @@ -39,5 +39,5 @@ index b1c06388b..cf753d362 100644 return true; } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch index 8858fc8ca8..9fb595f394 100644 --- a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 42a77fc1a82c991e0fb75264e059997e0a6ad657 Mon Sep 17 00:00:00 2001 +From 1e08f53824449b8f1d616390f0fd67273bcd740b Mon Sep 17 00:00:00 2001 From: Jedediah Smith 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 9be557062..3b4b5cf8c 100644 +index 8bd9f2113..8dc7b1893 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1053,7 +1053,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -23,10 +23,10 @@ index 9be557062..3b4b5cf8c 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 4822071c9..409582d5b 100644 +index eb7bdd222..ab164c11e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -82,6 +82,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -81,6 +81,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private double health = 20; private boolean scaledHealth = false; private double healthScale = 20; @@ -37,7 +37,7 @@ index 4822071c9..409582d5b 100644 public CraftPlayer(CraftServer server, EntityPlayer entity) { super(server, entity); -@@ -1557,6 +1561,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1562,6 +1566,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); } diff --git a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 315635fcac..b3962c2ed6 100644 --- a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From 3d32a01b2bdddf62287fb6e4d45db50f4392299b Mon Sep 17 00:00:00 2001 +From bbbe4a9875c7f57a00a7c0d252d5a359d5433134 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 2b20a0205..793353ac7 100644 +index 582eaa4ea..e0a793709 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -482,7 +482,13 @@ public abstract class EntityLiving extends Entity { @@ -44,10 +44,10 @@ index 2b20a0205..793353ac7 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5839801f5..78aab5c63 100644 +index ab164c11e..cf210d43b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1385,6 +1385,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1384,6 +1384,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void setRealHealth(double health) { @@ -56,5 +56,5 @@ index 5839801f5..78aab5c63 100644 } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch index ae47d22430..2101d9a345 100644 --- a/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 47707ae66e07a5a249d29be95801f530ba0dfec1 Mon Sep 17 00:00:00 2001 +From a58421c225b9c822b0477e77ec5220400ada6a3c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 78aab5c63..00f9229f0 100644 +index cf210d43b..71034f945 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -597,6 +597,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -596,6 +596,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return true; } @@ -28,5 +28,5 @@ index 78aab5c63..00f9229f0 100644 public void setSneaking(boolean sneak) { getHandle().setSneaking(sneak); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch index fcd1a8968d..8edd8a3413 100644 --- a/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch @@ -1,50 +1,61 @@ -From 054a32d7f09e98ed104f49c379a7f1ccdefd53ed Mon Sep 17 00:00:00 2001 +From ddf7fe9b14aa6ad4a511f9f9ae8071d52d5723e8 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 01adb5807..6024b001f 100644 +index 6fdde5c07..33f34ed0e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand; +@@ -32,7 +32,7 @@ import org.bukkit.inventory.MainHand; public class EntityPlayer extends EntityHuman implements ICrafting { private static final Logger bV = LogManager.getLogger(); -- public String locale = "en_US"; // Spigot private -> public -+ public String locale = null; // Spigot private -> public // Paper - default to null +- public String locale = "en_us"; // PAIL: private -> public ++ public String locale = null; // PAIL: private -> public // Paper - default to null public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1224,7 +1224,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1224,12 +1224,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { + PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT); this.server.server.getPluginManager().callEvent(event); } - // CraftBukkit end +- if (!this.locale.equals(packetplayinsettings.a())) { + + // Paper start - add PlayerLocaleChangeEvent + // Since the field is initialized to null, this event should always fire the first time the packet is received + String oldLocale = this.locale; - this.locale = packetplayinsettings.a(); ++ this.locale = packetplayinsettings.a(); + if (!this.locale.equals(oldLocale)) { + new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), oldLocale, this.locale).callEvent(); + } ++ ++ // Compat with Bukkit ++ oldLocale = oldLocale != null ? oldLocale : "en_us"; + // Paper end ++ ++ if (!oldLocale.equals(packetplayinsettings.a())) { + PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), packetplayinsettings.a()); + this.server.server.getPluginManager().callEvent(event); + } + // CraftBukkit end +- this.locale = packetplayinsettings.a(); this.cl = packetplayinsettings.c(); this.cm = packetplayinsettings.d(); this.getDataWatcher().set(EntityPlayer.br, 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 ca0fd5843..234becfd4 100644 +index 71034f945..171e0f7bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1688,7 +1688,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1693,7 +1693,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { - return getHandle().locale; + // Paper start - Locale change event + final String locale = getHandle().locale; -+ return locale != null ? locale : "en_US"; ++ return locale != null ? locale : "en_us"; } @Override diff --git a/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch index 4942fb0293..8dd6f1c557 100644 --- a/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch @@ -1,14 +1,14 @@ -From 8a8cc57b3143fb893806580589ec22d297519155 Mon Sep 17 00:00:00 2001 +From fe1f57baf7f591205d60163a69066067ce4487a6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f4a2e748d..2b01c5395 100644 +index 33f34ed0e..fff461e3c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -715,6 +715,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -716,6 +716,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (entity1 != entity && this.playerConnection != null) { this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch); } @@ -23,5 +23,5 @@ index f4a2e748d..2b01c5395 100644 } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch index f80dd7adf3..c4c545e5f6 100644 --- a/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 6c083dc4268feabf71e564d138ea7fbade9eb4ae Mon Sep 17 00:00:00 2001 +From dae2dec377b431508465b4d4350453c14f8d3857 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -96,13 +96,13 @@ index 9836c0c5a..39f0f5a17 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2ee915226..fd7fda511 100644 +index fff461e3c..39311e1d1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -33,6 +33,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { private static final Logger bV = LogManager.getLogger(); - public String locale = null; // Spigot private -> public // Paper - default to null + public String locale = null; // PAIL: private -> public // Paper - default to null + public long lastSave = MinecraftServer.currentTick; // Paper public PlayerConnection playerConnection; public final MinecraftServer server; diff --git a/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch index f95eeb2409..5693e9de0f 100644 --- a/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From 552adcd953a3950a22637c5b6955d3ef35f05edb Mon Sep 17 00:00:00 2001 +From 52a6f852507486ee9db350b6669b4e62387c7064 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login @@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login Bring down to a saner Y level if super high, as this can cause the server to crash diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 42eaef8a1..57d21fc12 100644 +index 39311e1d1..04c36d36e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -131,6 +131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -132,6 +132,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void a(NBTTagCompound nbttagcompound) { super.a(nbttagcompound); @@ -18,5 +18,5 @@ index 42eaef8a1..57d21fc12 100644 if (this.C_().getForceGamemode()) { this.playerInteractManager.setGameMode(this.C_().getGamemode()); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch index e496bb18dc..2221118dce 100644 --- a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From c318f830a7efb9c5f4a9cda7c7d0b25841ae3a14 Mon Sep 17 00:00:00 2001 +From ead97748d3e8508b9d6f43872697804248e10878 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 182513efd..3906d4bf7 100644 +index 04c36d36e..2ee3fb782 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -3,8 +3,10 @@ package net.minecraft.server; @@ -19,7 +19,7 @@ index 182513efd..3906d4bf7 100644 import java.util.Iterator; import java.util.List; import javax.annotation.Nonnull; -@@ -38,7 +40,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -39,7 +41,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public final PlayerInteractManager playerInteractManager; public double d; public double e; @@ -28,7 +28,7 @@ index 182513efd..3906d4bf7 100644 private final AdvancementDataPlayer bY; private final ServerStatisticManager bZ; private float ca = Float.MIN_VALUE; -@@ -286,10 +288,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -287,10 +289,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { Iterator iterator = this.removeQueue.iterator(); int j = 0; @@ -47,7 +47,7 @@ index 182513efd..3906d4bf7 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1097,7 +1106,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1098,7 +1107,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.ch = -1; // this.cr.a((RecipeBook) entityplayer.cr); // CraftBukkit diff --git a/Spigot-Server-Patches/0186-IllegalPacketEvent.patch b/Spigot-Server-Patches/0186-IllegalPacketEvent.patch index 77be96c824..24d4c52050 100644 --- a/Spigot-Server-Patches/0186-IllegalPacketEvent.patch +++ b/Spigot-Server-Patches/0186-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 81ca3b6d928d35962fbd7988186976ebfaa00756 Mon Sep 17 00:00:00 2001 +From 1a257238cc3385b3f23de66f8bd516e30665c32e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Jun 2016 23:33:57 -0400 Subject: [PATCH] IllegalPacketEvent @@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent Fired for invalid data from players that represents hacking attempts diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 12e07ccc4..9ee2cd17d 100644 +index 2c29bc634..8c18f1413 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; @@ -17,7 +17,7 @@ index 12e07ccc4..9ee2cd17d 100644 import co.aikar.timings.MinecraftTimings; // Paper // CraftBukkit end -@@ -2330,8 +2331,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2329,8 +2330,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit } } catch (Exception exception) { @@ -27,7 +27,7 @@ index 12e07ccc4..9ee2cd17d 100644 } } else { String s1; -@@ -2380,8 +2380,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2379,8 +2379,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit } } catch (Exception exception1) { @@ -37,7 +37,7 @@ index 12e07ccc4..9ee2cd17d 100644 } } else if ("MC|TrSel".equals(s)) { try { -@@ -2392,8 +2391,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2391,8 +2390,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { ((ContainerMerchant) container).d(j); } } catch (Exception exception2) { @@ -47,7 +47,7 @@ index 12e07ccc4..9ee2cd17d 100644 } } else { TileEntity tileentity; -@@ -2534,8 +2532,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2533,8 +2531,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { iinventory.update(); } } catch (Exception exception5) { @@ -57,7 +57,7 @@ index 12e07ccc4..9ee2cd17d 100644 } } } else if ("MC|ItemName".equals(s)) { -@@ -2634,8 +2631,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2633,8 +2630,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k))); this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); } catch (Exception exception7) { diff --git a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch index 7321f9de4e..aed61350b6 100644 --- a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 0b2b35012342c40c9c595e7e0b17b907858f51eb Mon Sep 17 00:00:00 2001 +From d0fd46413d9192119722ce88d9dfcae48cd11fda Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 3906d4bf7..0cd711c3e 100644 +index 2ee3fb782..93f0dfedf 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1477,7 +1477,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1486,7 +1486,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { @@ -19,10 +19,10 @@ index 3906d4bf7..0cd711c3e 100644 public void reset() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9ee2cd17d..32baff5e2 100644 +index 8c18f1413..41ad0cc2b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2674,6 +2674,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2673,6 +2673,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start - Add "isDisconnected" method public final boolean isDisconnected() { diff --git a/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch index 2e6d01ab12..742dfc2053 100644 --- a/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From c99f48d9799da82dbce8bf989e775e9159e09c64 Mon Sep 17 00:00:00 2001 +From f0dd346a0e407d5fba4a93ad5b2e38ddea5cfc79 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API @@ -62,10 +62,10 @@ index 1159eea1a..38359517c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d1f70af51..d698d7c0d 100644 +index 171e0f7bb..8bc8e2077 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -173,6 +173,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -172,6 +172,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Paper start @Override @@ -85,5 +85,5 @@ index d1f70af51..d698d7c0d 100644 PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); packet.header = header; -- -2.13.0 +2.13.0.windows.1 diff --git a/work/Bukkit b/work/Bukkit index cc40de8702..b673e15700 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit cc40de87027fc6668aa054dec8e8ac257aecf9d9 +Subproject commit b673e1570036bac636c01c11a8526867f23af45c diff --git a/work/CraftBukkit b/work/CraftBukkit index a479029a85..c037fe3d44 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a479029a85221fa6ce31742aee1abbcc1f998289 +Subproject commit c037fe3d442702885d9c6bfa65621fb624210c02 diff --git a/work/Spigot b/work/Spigot index 60095c9e3c..ea4525e683 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 60095c9e3cb482a4933612f89197c1ec6b74641b +Subproject commit ea4525e6830e7545c5315fc557a6fc6dcdf3f4ae