diff options
Diffstat (limited to 'patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch')
-rw-r--r-- | patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch index a44fd00d40..266b283a5d 100644 --- a/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 976dbf40292b10364f9e80bebe96ec9c4dfb657e..c375081e02925da6085a2d433bfc2c3719770f78 100644 +index 62d296ac82d322f3574021f54779dbb10954397e..79ca304ee934e29145f7fa2fa06cbdc3ba67d54d 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1213,12 +1213,15 @@ public abstract class Mob extends LivingEntity { +@@ -1219,12 +1219,15 @@ public abstract class Mob extends LivingEntity { return InteractionResult.PASS; } else if (this.getLeashHolder() == player) { // CraftBukkit start - fire PlayerUnleashEntityEvent @@ -26,7 +26,7 @@ index 976dbf40292b10364f9e80bebe96ec9c4dfb657e..c375081e02925da6085a2d433bfc2c37 return InteractionResult.sidedSuccess(this.level.isClientSide); } else { InteractionResult enuminteractionresult = this.checkAndHandleImportantInteractions(player, hand); -@@ -1376,8 +1379,11 @@ public abstract class Mob extends LivingEntity { +@@ -1382,8 +1385,11 @@ public abstract class Mob extends LivingEntity { if (this.leashHolder != null) { if (!this.isAlive() || !this.leashHolder.isAlive()) { @@ -40,7 +40,7 @@ index 976dbf40292b10364f9e80bebe96ec9c4dfb657e..c375081e02925da6085a2d433bfc2c37 } } -@@ -1440,8 +1446,11 @@ public abstract class Mob extends LivingEntity { +@@ -1446,8 +1452,11 @@ public abstract class Mob extends LivingEntity { boolean flag1 = super.startRiding(entity, force); if (flag1 && this.isLeashed()) { @@ -54,7 +54,7 @@ index 976dbf40292b10364f9e80bebe96ec9c4dfb657e..c375081e02925da6085a2d433bfc2c37 } return flag1; -@@ -1611,8 +1620,11 @@ public abstract class Mob extends LivingEntity { +@@ -1617,8 +1626,11 @@ public abstract class Mob extends LivingEntity { @Override protected void removeAfterChangingDimensions() { super.removeAfterChangingDimensions(); @@ -122,10 +122,10 @@ index b9b67134f02fd7484ed19905c9ae1f9b8a26ce26..c05f173b7642380900fdd77ce5d2c020 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index db6b057eb6b0f08f7fcb998f8b646b757a98d3f6..33a8e174c4e3b3b5164157c90c8f5b5f9c6d8263 100644 +index a921d98d2bc35e59e948893b2cb034b009db4753..ae3ee371530a52d9a2b12e5c18fd85f6da6fc2de 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1489,8 +1489,10 @@ public class CraftEventFactory { +@@ -1495,8 +1495,10 @@ public class CraftEventFactory { return itemInHand; } |