mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
World can be null for sign conversion, fixes #886
This commit is contained in:
parent
60cdf86b8a
commit
dfe2b00874
@ -1,11 +1,24 @@
|
|||||||
From 1c427c765b20086e3ee11f87d4e5ffb653067c43 Mon Sep 17 00:00:00 2001
|
From 220e3ea760acbe9b80893c45b55012089f55cc60 Mon Sep 17 00:00:00 2001
|
||||||
From: kashike <kashike@vq.lc>
|
From: kashike <kashike@vq.lc>
|
||||||
Date: Mon, 18 Sep 2017 13:38:40 -0700
|
Date: Mon, 18 Sep 2017 13:38:40 -0700
|
||||||
Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
|
Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||||
|
index 54b719d91..3f2c5b2d5 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||||
|
@@ -60,7 +60,7 @@ public class TileEntitySign extends TileEntity {
|
||||||
|
}
|
||||||
|
|
||||||
|
public MinecraftServer C_() {
|
||||||
|
- return TileEntitySign.this.world.getMinecraftServer();
|
||||||
|
+ return MinecraftServer.getServer(); // Paper - world may be null
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||||||
index 266f87d7..22dcaea7 100644
|
index 266f87d7f..22dcaea72 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||||||
@@ -24,6 +24,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
|
@@ -24,6 +24,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
|
||||||
|
Loading…
Reference in New Issue
Block a user