mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 21:48:11 +02:00
9147456fc9
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
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
|