From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java index 096e1cc920f5f48fe59b9419827c3cbb7adefe14..ee8819884868b70f2a3644141eca1d92abe2b7a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -951,6 +951,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { 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 (!this.getHandle().noCollision(bb)) continue; // Paper - add collision check List list = (List) this.getHandle().getEntities(null, bb); for (Iterator it = list.iterator(); !taken && it.hasNext(); ) { net.minecraft.world.entity.Entity e = it.next(); @@ -977,7 +978,8 @@ public abstract class CraftRegionAccessor implements RegionAccessor { if (Painting.class.isAssignableFrom(clazz)) { if (this.isNormalWorld() && randomizeData) { entity = net.minecraft.world.entity.decoration.Painting.create(world, pos, dir).orElse(null); - } else { + } // Paper + if (entity == null) { // Paper - if randomizeData fails, force it entity = new net.minecraft.world.entity.decoration.Painting(net.minecraft.world.entity.EntityType.PAINTING, this.getHandle().getMinecraftWorld()); entity.absMoveTo(x, y, z, yaw, pitch); ((net.minecraft.world.entity.decoration.Painting) entity).setDirection(dir);