From 40f15832b4036eb8f96993b8ab0fec56330b50df Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 19 Jul 2018 10:37:25 +1000 Subject: SPIGOT-4048: Fish disappear when they cannot be picked up --- nms-patches/PlayerConnection.patch | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch index 46c54385..4a550027 100644 --- a/nms-patches/PlayerConnection.patch +++ b/nms-patches/PlayerConnection.patch @@ -1096,7 +1096,7 @@ WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); Entity entity = packetplayinuseentity.a((World) worldserver); -@@ -1011,20 +1731,68 @@ +@@ -1011,20 +1731,73 @@ if (this.player.h(entity) < d0) { EnumHand enumhand; @@ -1116,7 +1116,12 @@ + } + this.server.getPluginManager().callEvent(event); + -+ if (triggerLeashUpdate && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != Items.LEAD)) { ++ // Fish bucket - SPIGOT-4048 ++ if ((entity instanceof EntityFish && origItem != null && origItem.getItem() == Items.WATER_BUCKET) && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem)) { ++ this.sendPacket(new PacketPlayOutSpawnEntityLiving((EntityFish) entity)); ++ } ++ ++ if (triggerLeashUpdate && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem)) { + // Refresh the current leash state + this.sendPacket(new PacketPlayOutAttachEntity(entity, ((EntityInsentient) entity).getLeashHolder())); + } @@ -1166,7 +1171,7 @@ } } } -@@ -1040,7 +1808,8 @@ +@@ -1040,7 +1813,8 @@ case PERFORM_RESPAWN: if (this.player.viewingCredits) { this.player.viewingCredits = false; @@ -1176,7 +1181,7 @@ CriterionTriggers.v.a(this.player, DimensionManager.THE_END, DimensionManager.OVERWORLD); } else { if (this.player.getHealth() > 0.0F) { -@@ -1063,14 +1832,20 @@ +@@ -1063,14 +1837,20 @@ public void a(PacketPlayInCloseWindow packetplayinclosewindow) { PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer()); @@ -1199,7 +1204,7 @@ NonNullList nonnulllist = NonNullList.a(); for (int i = 0; i < this.player.activeContainer.slots.size(); ++i) { -@@ -1079,8 +1854,274 @@ +@@ -1079,8 +1859,274 @@ this.player.a(this.player.activeContainer, nonnulllist); } else { @@ -1211,7 +1216,7 @@ + + InventoryView inventory = this.player.activeContainer.getBukkitView(); + SlotType type = CraftInventoryView.getSlotType(inventory, packetplayinwindowclick.b()); -+ + + InventoryClickEvent event; + ClickType click = ClickType.UNKNOWN; + InventoryAction action = InventoryAction.UNKNOWN; @@ -1401,7 +1406,7 @@ + } + } + } - ++ + event.setCancelled(cancelled); + Container oldContainer = this.player.activeContainer; // SPIGOT-1224 + server.getPluginManager().callEvent(event); @@ -1475,7 +1480,7 @@ if (ItemStack.matches(packetplayinwindowclick.f(), itemstack)) { this.player.playerConnection.sendPacket(new PacketPlayOutTransaction(packetplayinwindowclick.b(), packetplayinwindowclick.e(), true)); this.player.f = true; -@@ -1123,6 +2164,7 @@ +@@ -1123,6 +2169,7 @@ public void a(PacketPlayInEnchantItem packetplayinenchantitem) { PlayerConnectionUtils.ensureMainThread(packetplayinenchantitem, this, this.player.getWorldServer()); @@ -1483,7 +1488,7 @@ this.player.resetIdleTimer(); if (this.player.activeContainer.windowId == packetplayinenchantitem.b() && this.player.activeContainer.c(this.player) && !this.player.isSpectator()) { this.player.activeContainer.a(this.player, packetplayinenchantitem.c()); -@@ -1154,6 +2196,43 @@ +@@ -1154,6 +2201,43 @@ boolean flag1 = packetplayinsetcreativeslot.b() >= 1 && packetplayinsetcreativeslot.b() <= 45; boolean flag2 = itemstack.isEmpty() || itemstack.getDamage() >= 0 && itemstack.getCount() <= 64 && !itemstack.isEmpty(); @@ -1527,7 +1532,7 @@ if (flag1 && flag2) { if (itemstack.isEmpty()) { -@@ -1177,6 +2256,7 @@ +@@ -1177,6 +2261,7 @@ public void a(PacketPlayInTransaction packetplayintransaction) { PlayerConnectionUtils.ensureMainThread(packetplayintransaction, this, this.player.getWorldServer()); @@ -1535,7 +1540,7 @@ Short oshort = (Short) this.k.get(this.player.activeContainer.windowId); if (oshort != null && packetplayintransaction.c() == oshort.shortValue() && this.player.activeContainer.windowId == packetplayintransaction.b() && !this.player.activeContainer.c(this.player) && !this.player.isSpectator()) { -@@ -1187,6 +2267,7 @@ +@@ -1187,6 +2272,7 @@ public void a(PacketPlayInUpdateSign packetplayinupdatesign) { PlayerConnectionUtils.ensureMainThread(packetplayinupdatesign, this, this.player.getWorldServer()); @@ -1543,7 +1548,7 @@ this.player.resetIdleTimer(); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); BlockPosition blockposition = packetplayinupdatesign.b(); -@@ -1203,14 +2284,30 @@ +@@ -1203,14 +2289,30 @@ if (!tileentitysign.d() || tileentitysign.e() != this.player) { this.minecraftServer.warning("Player " + this.player.getDisplayName().getString() + " just tried to change non-editable sign"); @@ -1575,7 +1580,7 @@ tileentitysign.update(); worldserver.notify(blockposition, iblockdata, iblockdata, 3); -@@ -1219,6 +2316,7 @@ +@@ -1219,6 +2321,7 @@ } public void a(PacketPlayInKeepAlive packetplayinkeepalive) { @@ -1583,7 +1588,7 @@ if (this.g && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.b() - this.f); -@@ -1232,7 +2330,17 @@ +@@ -1232,7 +2335,17 @@ public void a(PacketPlayInAbilities packetplayinabilities) { PlayerConnectionUtils.ensureMainThread(packetplayinabilities, this, this.player.getWorldServer()); @@ -1602,7 +1607,7 @@ } public void a(PacketPlayInSettings packetplayinsettings) { -@@ -1240,5 +2348,47 @@ +@@ -1240,5 +2353,47 @@ this.player.a(packetplayinsettings); } -- cgit v1.2.3