SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more patches (#5807)

Browse Source
This commit is contained in:
Jake Potrebic
2021-06-12 09:56:13 -07:00
parent 264337e396
commit 3aae52d6f5
29 changed files with 120 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/Add-MinecraftKey-Information-to-Objects.patch
View File

@@ -107,15 +107,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
// CraftBukkit start - data containers
@@ -0,0 +0,0 @@ public abstract class BlockEntity {
public CraftPersistentDataContainer persistentDataContainer;
// CraftBukkit end
private static final Logger LOGGER = LogManager.getLogger();
- private final BlockEntityType<?> type;
+ private final BlockEntityType<?> type; public BlockEntityType getTileEntityType() { return type; } // Paper - OBFHELPER
@Nullable
protected Level level;
protected final BlockPos worldPosition;
@@ -0,0 +0,0 @@ public abstract class BlockEntity {
this.blockState = state;
}
@@ -127,7 +118,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @Override
+ public ResourceLocation getMinecraftKey() {
+ if (tileEntityKey == null) {
+ tileEntityKey = BlockEntityType.getKey(this.getTileEntityType());
+ tileEntityKey = BlockEntityType.getKey(this.type);
+ tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null;
+ }
+ return tileEntityKey;