OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-20 14:08:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5482: Structure Block setUsageMode encounters NullpointerException

Browse source
This commit is contained in:
md_5 2019-12-25 10:09:20 +11:00
parent 82322fe06c
commit edcb0a4b6a
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nms-patches/TileEntityStructure.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/net/minecraft/server/TileEntityStructure.java
+++ b/net/minecraft/server/TileEntityStructure.java
@@ -18,7 +18,7 @@
public BlockPosition size;
public EnumBlockMirror mirror;
public EnumBlockRotation rotation;
- private BlockPropertyStructureMode usageMode;
+ public BlockPropertyStructureMode usageMode;
public boolean ignoreEntities;
private boolean powered;
public boolean showAir;

10
src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java
View file

@ -105,7 +105,7 @@ public class CraftStructureBlock extends CraftBlockEntityState<TileEntityStructu
@Override @Override
public void setUsageMode(UsageMode mode) { public void setUsageMode(UsageMode mode) {
getSnapshot().setUsageMode(BlockPropertyStructureMode.valueOf(mode.name())); getSnapshot().usageMode = BlockPropertyStructureMode.valueOf(mode.name());
} }
@Override @Override
@ -177,6 +177,14 @@ public class CraftStructureBlock extends CraftBlockEntityState<TileEntityStructu
return getSnapshot().metadata; return getSnapshot().metadata;
} }
@Override
protected void applyTo(TileEntityStructure tileEntity) {
super.applyTo(tileEntity);
// Ensure block type is correct
tileEntity.setUsageMode(tileEntity.getUsageMode());
}
private static boolean isBetween(int num, int min, int max) { private static boolean isBetween(int num, int min, int max) {
return num >= min && num <= max; return num >= min && num <= max;
} }