diff --git a/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch index bf9d9423db..97d927621d 100644 --- a/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 5b8f5317f8a927fdcfb7a0153a52663d7d76dd82 Mon Sep 17 00:00:00 2001 +From 179783bf52fb0e0b9f812a3e0c89ba79ca6704fc 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 409443356a..9b68c5fec1 100644 +index 1b8b6daac..c9c5af65a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand; @@ -17,7 +17,7 @@ index 409443356a..9b68c5fec1 100644 public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1441,13 +1441,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1444,13 +1444,20 @@ 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); } @@ -40,7 +40,7 @@ index 409443356a..9b68c5fec1 100644 this.cl = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bt, (byte) packetplayinsettings.f()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f75ac03b74..06db4a8f04 100644 +index f75ac03b7..06db4a8f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1749,8 +1749,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0126-Optimise-removeQueue.patch b/Spigot-Server-Patches/0126-Optimise-removeQueue.patch index 864ef1e25c..78e0f162fc 100644 --- a/Spigot-Server-Patches/0126-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0126-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From 4c4a157dd89cb73330a1850b5062b9880bae307c Mon Sep 17 00:00:00 2001 +From de2b62887def1fa621a3e390e65c4b9fa2b6b997 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 d61d159d11..f4f5ae50b4 100644 +index 1e6b8bd46..cb34c6beb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; @@ -50,7 +50,7 @@ index d61d159d11..f4f5ae50b4 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1315,7 +1324,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1318,7 +1327,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit diff --git a/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch index 5c9e205878..07bd27dea4 100644 --- a/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 3a0455f9978597e53e4b162eddf94b8e42342e6c Mon Sep 17 00:00:00 2001 +From f316eb9374bf4515acd9062b3388bd65d20bbeda 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 f4f5ae50b4..071fe14d34 100644 +index cb34c6beb..8074465f1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1788,7 +1788,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1791,7 +1791,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { @@ -19,7 +19,7 @@ index f4f5ae50b4..071fe14d34 100644 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ea62e9bafd..693688c340 100644 +index ea62e9baf..693688c34 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2540,7 +2540,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch index d0fb00ae89..dff8d02945 100644 --- a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From fb299c0d3bad297d88a19ff758a960a3d1cba451 Mon Sep 17 00:00:00 2001 +From 9792c586bfaca7a0bfefb14b3a45d0d37b109688 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 3031d73f5f..f665dc0ebe 100644 +index 3031d73f5..f665dc0eb 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -34,7 +34,7 @@ index 3031d73f5f..f665dc0ebe 100644 this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 071fe14d34..870ef557a2 100644 +index 8074465f1..32ac372bc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -64,7 +64,7 @@ index 071fe14d34..870ef557a2 100644 } this.nextContainerCounter(); -@@ -1103,7 +1103,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1106,7 +1106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // CraftBukkit end if (this.activeContainer != this.defaultContainer) { @@ -73,7 +73,7 @@ index 071fe14d34..870ef557a2 100644 } // this.nextContainerCounter(); // CraftBukkit - moved up -@@ -1167,7 +1167,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1170,7 +1170,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void closeInventory() { @@ -88,7 +88,7 @@ index 071fe14d34..870ef557a2 100644 this.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 594196107c..221eb5fdcd 100644 +index c009d7adc..ca5e11709 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2049,7 +2049,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -101,7 +101,7 @@ index 594196107c..221eb5fdcd 100644 this.player.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index cacd769543..58bfafc6b2 100644 +index cacd76954..58bfafc6b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -401,7 +401,7 @@ public abstract class PlayerList { @@ -114,7 +114,7 @@ index cacd769543..58bfafc6b2 100644 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 390ba575f8..bd38c65478 100644 +index 176ac3c65..0e559133f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -988,7 +988,7 @@ public class WorldServer extends World { @@ -136,7 +136,7 @@ index 390ba575f8..bd38c65478 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index d0a019f50d..79fc638a0b 100644 +index d0a019f50..79fc638a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -607,8 +607,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -155,7 +155,7 @@ index d0a019f50d..79fc638a0b 100644 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 23a205af1e..88398c3320 100644 +index 23a205af1..88398c332 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -771,7 +771,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -168,7 +168,7 @@ index 23a205af1e..88398c3320 100644 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 30fe2528ae..b570e2778b 100644 +index 7426c5400..ad14d74b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1239,8 +1239,19 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch index 9a228dd224..8f08381d10 100644 --- a/Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From 3adc6542b773cb335338939d4517c7b63d283d92 Mon Sep 17 00:00:00 2001 +From cd563ddeac82f466e39ae9821d4cf0675bfc4fa3 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a3f5919fe8..9756109038 100644 +index c5621d9dc..cbcf86b60 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,7 +17,7 @@ index a3f5919fe8..9756109038 100644 public boolean worldChangeInvuln; private boolean cp; private void setHasSeenCredits(boolean has) { this.cp = has; } // Paper - OBFHELPER private final RecipeBookServer recipeBook; -@@ -1566,15 +1566,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1569,15 +1569,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity); } diff --git a/Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch index e561f4031c..4242e834ff 100644 --- a/Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From 77d8f8c9c1b41b5c52323074c3803b580767cc0b Mon Sep 17 00:00:00 2001 +From 9d17483d9365afeef430427bbaf7a47ef7670843 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index af26b4bffb..7f4e18c991 100644 +index c7e5539dd..60fac7757 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2274,7 +2274,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,10 +18,10 @@ index af26b4bffb..7f4e18c991 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 9756109038..14710abe1a 100644 +index cbcf86b60..f5244de49 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1854,6 +1854,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.setHealth(this.getMaxHealth()); diff --git a/Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 89c42d85e5..7b70f3fcb3 100644 --- a/Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,14 +1,14 @@ -From 167138169d5749d96e57cf3e36dc0aaac00abef9 Mon Sep 17 00:00:00 2001 +From 68cc5d952fc9e0db1bdab48c0ed0602e73b1a038 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 412b2e79ad..a18afbcdde 100644 +index 8eb6a5fb7..f905ff4a3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1277,6 +1277,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void n() { this.ct = true; this.ejectPassengers(); diff --git a/work/CraftBukkit b/work/CraftBukkit index 6ceffb0d2a..7d29eb5e5a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 6ceffb0d2aa1d4118b70274c5b7603fb2e32ab35 +Subproject commit 7d29eb5e5a25352a51096efb57a0900793bba2de