Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-01 05:01:37 +01:00
Code Issues Projects Releases Wiki Activity

Do not remove leash knot if leasing to an existing leash knot gets cancelled

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2024-04-28 07:27:18 +10:00
parent 6041b5c6b5
commit 44c4305918
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityLeash.patch
View File

@ -14,20 +14,21 @@
public class EntityLeash extends EntityHanging { public class EntityLeash extends EntityHanging {
public static final double OFFSET_Y = 0.375D; public static final double OFFSET_Y = 0.375D;
@@ -89,6 +96,12 @@ @@ -89,6 +96,13 @@
EntityInsentient entityinsentient = (EntityInsentient) iterator.next(); EntityInsentient entityinsentient = (EntityInsentient) iterator.next();
if (entityinsentient.getLeashHolder() == entityhuman) { if (entityinsentient.getLeashHolder() == entityhuman) {
+ // CraftBukkit start + // CraftBukkit start
+ if (CraftEventFactory.callPlayerLeashEntityEvent(entityinsentient, this, entityhuman, enumhand).isCancelled()) { + if (CraftEventFactory.callPlayerLeashEntityEvent(entityinsentient, this, entityhuman, enumhand).isCancelled()) {
+ ((EntityPlayer) entityhuman).connection.send(new PacketPlayOutAttachEntity(entityinsentient, entityinsentient.getLeashHolder())); + ((EntityPlayer) entityhuman).connection.send(new PacketPlayOutAttachEntity(entityinsentient, entityinsentient.getLeashHolder()));
+ flag = true; // Also set true when the event is cancelled otherwise it tries to unleash the entities
+ continue; + continue;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
entityinsentient.setLeashedTo(this, true); entityinsentient.setLeashedTo(this, true);
flag = true; flag = true;
} }
@@ -97,18 +110,32 @@ @@ -97,18 +111,32 @@
boolean flag1 = false; boolean flag1 = false;
if (!flag) { if (!flag) {