Skip to content

Commit df9684c

Browse files
committed
Fix NPE when unsetting leash holder in EntityUnleashEvent (#13645)
1 parent 79c77f5 commit df9684c

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

paper-server/patches/sources/net/minecraft/world/entity/Leashable.java.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
default double leashSnapDistance() {
7373
return 12.0;
7474
}
75-
@@ -195,7 +_,25 @@
75+
@@ -195,7 +_,27 @@
7676
}
7777

7878
default void leashTooFarBehaviour() {
@@ -85,9 +85,11 @@
8585
+ if (!event.callEvent()) return;
8686
+
8787
+ Entity leashHolder = this.getLeashHolder();
88-
+ Level level = leashHolder.level();
88+
+ if (leashHolder != null) {
89+
+ Level level = leashHolder.level();
90+
+ level.playSound(null, leashHolder.getX(), leashHolder.getY(), leashHolder.getZ(), SoundEvents.LEAD_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F); // Moved from Leashable#tickLeash
91+
+ }
8992
+ dropLeash = event.isDropLeash();
90-
+ level.playSound(null, leashHolder.getX(), leashHolder.getY(), leashHolder.getZ(), SoundEvents.LEAD_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F); // Moved from Leashable#tickLeash
9193
+ }
9294
+ // CraftBukkit end
9395
+ if (dropLeash) {

0 commit comments

Comments
 (0)