From 0ecc1545dd3639acc01df34a21b91ede392eed15 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 13 Feb 2019 09:07:12 -0500 Subject: [PATCH] Update upstream CB --- work/CraftBukkit Submodule work/CraftBukkit a2dd0e303..51c118b1d: > SPIGOT-4619: Incorrect packet order for villager inventories > Fix EntityPickupItemEvent getRemaining / PlayerInventory#canHold --- .../0106-Implement-PlayerLocaleChangeEvent.patch | 8 ++++---- Spigot-Server-Patches/0147-Optimise-removeQueue.patch | 6 +++--- .../0158-Properly-fix-item-duplication-bug.patch | 8 ++++---- .../0280-InventoryCloseEvent-Reason-API.patch | 8 ++++---- .../0385-Call-player-spectator-target-events.patch | 6 +++--- .../0390-Reset-players-airTicks-on-respawn.patch | 8 ++++---- ...karound-for-vehicle-tracking-issue-on-disconnect.patch | 6 +++--- work/CraftBukkit | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch index 94541b067..0cfe5b17f 100644 --- a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 16bf1fbf7ec3a0a4b65600c0508ab582cba394c3 Mon Sep 17 00:00:00 2001 +From c85f208a89a8a4d141c258f74610f8fc815ca3d3 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 98a8ce9623..aad5a35271 100644 +index 3bd93ada9..8b7a79b65 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -33,7 +33,7 @@ import org.bukkit.inventory.MainHand; @@ -17,7 +17,7 @@ index 98a8ce9623..aad5a35271 100644 public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1253,13 +1253,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1260,13 +1260,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 98a8ce9623..aad5a35271 100644 this.ct = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bx, (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 bf4fd64b93..ecef2a6ad6 100644 +index 40f31dd53..4398737cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1716,8 +1716,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0147-Optimise-removeQueue.patch b/Spigot-Server-Patches/0147-Optimise-removeQueue.patch index 218c76348..71d205d64 100644 --- a/Spigot-Server-Patches/0147-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0147-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From 042353c45f554897d7da678fc7773b646125c0e9 Mon Sep 17 00:00:00 2001 +From 04cc3fc57dc45648a2ddaa6f7097a6630a4101bc 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 742385ad1..a37af03d2 100644 +index ca715c138..3ee1d270f 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 742385ad1..a37af03d2 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1140,7 +1149,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1147,7 +1156,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/0158-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch index 81aacec0c..c19deb39d 100644 --- a/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From a4fa6f5e9ee8c5ab7be6c0ff8ca05993124977c7 Mon Sep 17 00:00:00 2001 +From 6cffdbfde8f8b4ad03f751ee44f3f96d2b37bea4 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 a37af03d23..cd488d37f2 100644 +index 3ee1d270f..55f4ab93e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1554,7 +1554,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1561,7 +1561,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { @@ -19,7 +19,7 @@ index a37af03d23..cd488d37f2 100644 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index aba7d209cb..75ceb4854b 100644 +index 849573864..a04bfded1 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2500,7 +2500,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch index 6da8d3341..92787d994 100644 --- a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From be44a8f7dca619d2ee1b614d648bf2bbb935f0fb Mon Sep 17 00:00:00 2001 +From c80cb650d92bb7c8994aa0edc393a2a48302402c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -56,7 +56,7 @@ index e06f03e80..59f108e49 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 cd488d37f..1054367d0 100644 +index 55f4ab93e..13409c041 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -344,7 +344,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -86,7 +86,7 @@ index cd488d37f..1054367d0 100644 } if (iinventory instanceof ITileInventory) { -@@ -933,7 +933,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -940,7 +940,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // CraftBukkit end if (this.activeContainer != this.defaultContainer) { @@ -95,7 +95,7 @@ index cd488d37f..1054367d0 100644 } this.nextContainerCounter(); -@@ -998,7 +998,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1005,7 +1005,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void closeInventory() { diff --git a/Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch index 44959d942..e136e0e8f 100644 --- a/Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From ec231941fc1da58e5b33fbe633825a813cab58a6 Mon Sep 17 00:00:00 2001 +From 7be052b2cfea55de1ca7e46b37078ea4c7e62652 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 00c2072d70..bd768e170c 100644 +index b01fffbd6..5757e1288 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -59,7 +59,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,7 +17,7 @@ index 00c2072d70..bd768e170c 100644 public boolean worldChangeInvuln; private boolean cx; private void setHasSeenCredits(boolean has) { this.cx = has; } // Paper - OBFHELPER private final RecipeBookServer recipeBook; -@@ -1377,15 +1377,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1384,15 +1384,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity); } diff --git a/Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch index 753e1f1f8..cd66e7d59 100644 --- a/Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From f2250ee165b70c7c46044dbe16fd3e1c63835c5f Mon Sep 17 00:00:00 2001 +From 9a0095b9042bcc51e91ae8a341ed3c7b12649bde 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 2f27af7f6e..e448f08930 100644 +index 2f27af7f6..e448f0893 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2348,7 +2348,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,10 +18,10 @@ index 2f27af7f6e..e448f08930 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index bd768e170c..71c4ed8fa6 100644 +index 5757e1288..005bcaac1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1620,6 +1620,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1627,6 +1627,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.setHealth(this.getMaxHealth()); diff --git a/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 0a503e1de..01f64f2bf 100644 --- a/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,14 +1,14 @@ -From 5733ba4d35501fc7d7127b2fa332cf0aa03dd88b Mon Sep 17 00:00:00 2001 +From 71f36b2308ade6e4c0080d5b910a2db325f56659 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 32557caf2b..5964781208 100644 +index de17da992..0b7b2c22d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1106,6 +1106,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1113,6 +1113,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void n() { this.cB = true; this.ejectPassengers(); diff --git a/work/CraftBukkit b/work/CraftBukkit index a2dd0e303..51c118b1d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a2dd0e3035e2645b7f867862b3673b7c3ce9f544 +Subproject commit 51c118b1d7f6ed9847fa853081e1eed67ddeb293