aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0867-Fix-possible-NPE-on-painting-creation.patch')
-rw-r--r--patches/server/0867-Fix-possible-NPE-on-painting-creation.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
new file mode 100644
index 0000000000..cf51e817de
--- /dev/null
+++ b/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 24 Jun 2023 09:42:53 -0700
+Subject: [PATCH] Fix possible NPE on painting creation
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index 7ba6302ecb72fa6e523054e7e3223d79eedf6589..63f9852de5b557351793ba3aebdd7e752caf2417 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -325,8 +325,13 @@ public final class CraftEntityTypes {
+ // Hanging
+ register(new EntityTypeData<>(EntityType.PAINTING, Painting.class, CraftPainting::new, createHanging(Painting.class, (spawnData, hangingData) -> {
+ if (spawnData.normalWorld && hangingData.randomize()) {
+- return net.minecraft.world.entity.decoration.Painting.create(spawnData.minecraftWorld(), hangingData.position(), hangingData.direction()).orElse(null);
+- } else {
++ // Paper start - if randomizeData fails, force it
++ final net.minecraft.world.entity.decoration.Painting entity = net.minecraft.world.entity.decoration.Painting.create(spawnData.minecraftWorld(), hangingData.position(), hangingData.direction()).orElse(null);
++ if (entity != null) {
++ return entity;
++ }
++ } /*else*/ {
++ // Paper end - if randomizeData fails, force it
+ net.minecraft.world.entity.decoration.Painting entity = new net.minecraft.world.entity.decoration.Painting(net.minecraft.world.entity.EntityType.PAINTING, spawnData.minecraftWorld());
+ entity.absMoveTo(spawnData.x(), spawnData.y(), spawnData.z(), spawnData.yaw(), spawnData.pitch());
+ entity.setDirection(hangingData.direction());
+@@ -465,6 +470,7 @@ public final class CraftEntityTypes {
+ AABB bb = (ItemFrame.class.isAssignableFrom(clazz))
+ ? net.minecraft.world.entity.decoration.ItemFrame.calculateBoundingBox(null, pos, CraftBlock.blockFaceToNotch(dir).getOpposite(), width, height)
+ : HangingEntity.calculateBoundingBox(null, pos, CraftBlock.blockFaceToNotch(dir).getOpposite(), width, height);
++ if (!spawnData.world.noCollision(bb)) continue; // Paper - add collision check
+ List<net.minecraft.world.entity.Entity> list = spawnData.world().getEntities(null, bb);
+ for (Iterator<net.minecraft.world.entity.Entity> it = list.iterator(); !taken && it.hasNext(); ) {
+ net.minecraft.world.entity.Entity e = it.next();