2018-07-04 09:55:24 +02:00
|
|
|
From d92126ecf2330dfafa65d2dde1dd6d1966cd5ca1 Mon Sep 17 00:00:00 2001
|
2017-11-24 08:28:57 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 6 Nov 2017 21:08:22 -0500
|
|
|
|
Subject: [PATCH] API to get a BlockState without a snapshot
|
|
|
|
|
|
|
|
This allows you to get a BlockState without creating a snapshot, operating
|
|
|
|
on the real tile entity.
|
|
|
|
|
|
|
|
This is useful for where performance is needed
|
|
|
|
|
2018-06-30 07:40:52 +02:00
|
|
|
also Avoid NPE during CraftBlockEntityState load if could not get TE
|
|
|
|
|
|
|
|
If Tile Entity was null, correct Sign to return empty lines instead of null
|
|
|
|
|
2017-11-24 08:28:57 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
2018-07-04 09:55:24 +02:00
|
|
|
index d3bc13726..cc7f2069d 100644
|
2017-11-24 08:28:57 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
2018-07-04 09:55:24 +02:00
|
|
|
@@ -284,7 +284,12 @@ public abstract class TileEntity implements KeyedObject {
|
2017-11-24 08:28:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// CraftBukkit start - add method
|
|
|
|
+ // Paper start
|
|
|
|
public InventoryHolder getOwner() {
|
|
|
|
+ return getOwner(true);
|
|
|
|
+ }
|
|
|
|
+ public InventoryHolder getOwner(boolean useSnapshot) {
|
|
|
|
+ // Paper end
|
|
|
|
if (world == null) return null;
|
|
|
|
// Spigot start
|
|
|
|
org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
|
2018-07-04 09:55:24 +02:00
|
|
|
@@ -293,7 +298,7 @@ public abstract class TileEntity implements KeyedObject {
|
2017-11-24 08:28:57 +01:00
|
|
|
return null;
|
|
|
|
}
|
|
|
|
// Spigot end
|
|
|
|
- org.bukkit.block.BlockState state = block.getState();
|
|
|
|
+ org.bukkit.block.BlockState state = block.getState(useSnapshot); // Paper
|
|
|
|
if (state instanceof InventoryHolder) return (InventoryHolder) state;
|
|
|
|
return null;
|
|
|
|
}
|
2018-06-30 07:40:52 +02:00
|
|
|
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
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-11-24 08:28:57 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
2018-06-30 07:40:52 +02:00
|
|
|
index 46670c346..a9d3f12bc 100644
|
2017-11-24 08:28:57 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
|
|
@@ -260,7 +260,22 @@ public class CraftBlock implements Block {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
public BlockState getState() {
|
|
|
|
+ // Paper start - allow disabling the use of snapshots
|
|
|
|
+ return getState(true);
|
|
|
|
+ }
|
|
|
|
+ public BlockState getState(boolean useSnapshot) {
|
|
|
|
+ boolean prev = CraftBlockEntityState.DISABLE_SNAPSHOT;
|
|
|
|
+ CraftBlockEntityState.DISABLE_SNAPSHOT = !useSnapshot;
|
|
|
|
+ try {
|
|
|
|
+ return getState0();
|
|
|
|
+ } finally {
|
|
|
|
+ CraftBlockEntityState.DISABLE_SNAPSHOT = prev;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ public BlockState getState0() {
|
|
|
|
+ // Paper end
|
|
|
|
Material material = getType();
|
|
|
|
|
|
|
|
switch (material) {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
2018-06-30 07:40:52 +02:00
|
|
|
index 266f87d7f..fe112812d 100644
|
2017-11-24 08:28:57 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
2018-06-30 07:40:52 +02:00
|
|
|
@@ -22,20 +22,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
|
2017-11-24 08:28:57 +01:00
|
|
|
CraftWorld world = (CraftWorld) this.getWorld();
|
|
|
|
this.tileEntity = tileEntityClass.cast(world.getTileEntityAt(this.getX(), this.getY(), this.getZ()));
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ this.snapshotDisabled = DISABLE_SNAPSHOT;
|
|
|
|
+ if (DISABLE_SNAPSHOT) {
|
2018-06-30 07:40:52 +02:00
|
|
|
+ this.snapshot = this.tileEntity;
|
|
|
|
+ } else {
|
|
|
|
+ this.snapshot = this.createSnapshot(this.tileEntity);
|
2017-11-24 08:28:57 +01:00
|
|
|
+ }
|
|
|
|
// copy tile entity data:
|
2018-06-30 07:40:52 +02:00
|
|
|
- this.snapshot = this.createSnapshot(tileEntity);
|
|
|
|
- this.load(snapshot);
|
|
|
|
+ if(this.snapshot != null) {
|
|
|
|
+ this.load(this.snapshot);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2017-11-24 08:28:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
+ public final boolean snapshotDisabled; // Paper
|
|
|
|
+ public static boolean DISABLE_SNAPSHOT = false; // Paper
|
|
|
|
+
|
|
|
|
public CraftBlockEntityState(Material material, T tileEntity) {
|
|
|
|
super(material);
|
|
|
|
|
|
|
|
this.tileEntityClass = (Class<T>) tileEntity.getClass();
|
|
|
|
this.tileEntity = tileEntity;
|
2018-06-30 07:40:52 +02:00
|
|
|
-
|
2017-11-24 08:28:57 +01:00
|
|
|
+ // Paper start
|
|
|
|
+ this.snapshotDisabled = DISABLE_SNAPSHOT;
|
|
|
|
+ if (DISABLE_SNAPSHOT) {
|
2018-06-30 07:40:52 +02:00
|
|
|
+ this.snapshot = this.tileEntity;
|
|
|
|
+ } else {
|
|
|
|
+ this.snapshot = this.createSnapshot(this.tileEntity);
|
|
|
|
+ }
|
|
|
|
// copy tile entity data:
|
|
|
|
- this.snapshot = this.createSnapshot(tileEntity);
|
|
|
|
- this.load(snapshot);
|
|
|
|
+ if(this.snapshot != null) {
|
|
|
|
+ this.load(this.snapshot);
|
2017-11-24 08:28:57 +01:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2018-06-30 07:40:52 +02:00
|
|
|
}
|
2017-11-24 08:28:57 +01:00
|
|
|
|
2018-06-30 07:40:52 +02:00
|
|
|
private T createSnapshot(T tileEntity) {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
|
|
|
index 7a8d44529..97b4e6910 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
|
|
|
@@ -14,10 +14,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
|
|
|
|
|
|
|
|
public CraftSign(final Block block) {
|
|
|
|
super(block, TileEntitySign.class);
|
|
|
|
+ if (lines == null) { lines = new String[]{"", "", "", ""}; } // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
public CraftSign(final Material material, final TileEntitySign te) {
|
|
|
|
super(material, te);
|
|
|
|
+ if (lines == null) { lines = new String[]{"", "", "", ""}; } // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
2017-11-24 08:28:57 +01:00
|
|
|
--
|
2018-06-30 07:40:52 +02:00
|
|
|
2.18.0
|
2017-11-24 08:28:57 +01:00
|
|
|
|