mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 08:20:51 +01:00
35 lines
2.8 KiB
Diff
35 lines
2.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
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 ee0f33ece945d71d67d11cd9bc825f5ca54333c4..be34abf2772f905be43125de4f78c0a6a3d3adf6 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
|
||
|
|
@@ -318,8 +318,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());
|
||
|
|
@@ -457,6 +462,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();
|