mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 20:21:51 +01:00
20 lines
981 B
Diff
20 lines
981 B
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: NonSwag <mrminecraft00@gmail.com>
|
||
|
|
Date: Tue, 6 Dec 2022 23:04:21 +0100
|
||
|
|
Subject: [PATCH] Fix NPE on Allay#stopDancing while not dancing
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
|
||
|
|
index db3b0a9d3696f31d473342312d437e1eae97404a..6dfb0b47bd77fa4584744b3a54267879521b540a 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
|
||
|
|
@@ -83,7 +83,7 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay
|
||
|
|
public void stopDancing() {
|
||
|
|
this.getHandle().forceDancing = false;
|
||
|
|
this.getHandle().jukeboxPos = null;
|
||
|
|
- this.getHandle().setJukeboxPlaying(null, false);
|
||
|
|
+ this.getHandle().setDancing(false); // Paper - Directly modify set dancing to avoid NPE
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override
|