diff options
| author | Aikar <[email protected]> | 2020-06-26 02:29:44 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-06-26 05:03:23 -0400 |
| commit | 68636aee7249e0784a1150799ba86bdeba8f0127 (patch) | |
| tree | bf8dcca3638ff3c7b799c77d193003195c5d15b9 /Spigot-Server-Patches/0004-MC-Utils.patch | |
| parent | 014b7f115dcd5f362c943fa07fe97527e2b27d4f (diff) | |
| download | Paper-68636aee7249e0784a1150799ba86bdeba8f0127.tar.gz Paper-68636aee7249e0784a1150799ba86bdeba8f0127.zip | |
Latest progress - restored patches, some issues resolved
Diffstat (limited to 'Spigot-Server-Patches/0004-MC-Utils.patch')
| -rw-r--r-- | Spigot-Server-Patches/0004-MC-Utils.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index b569c83569..5c52196e91 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -2318,6 +2318,18 @@ index eff6ebcd30b538cbaedaa031a46a59ea956253ba..30cbfc8eac20910aa55951e3dce63862 @Override public IBlockData getType(BlockPosition blockposition) { return Blocks.AIR.getBlockData(); +diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java +index 47324feca49786b49563d3d0e854e74ad27c190b..26d446077bb563ca3c5bb0339695b3364a3e41bf 100644 +--- a/src/main/java/net/minecraft/server/BlockBase.java ++++ b/src/main/java/net/minecraft/server/BlockBase.java +@@ -632,6 +632,7 @@ public abstract class BlockBase { + return this.a != null ? this.a.e : Block.a(this.getCollisionShape(iblockaccess, blockposition)); + } + ++ public IBlockData getBlockData() { return p(); } // Paper - OBFHELPER + protected abstract IBlockData p(); + + public boolean isAlwaysDestroyable() { diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java index 8eb94bcb605f882c9ce096fc758df5e3ae3ab28d..b61651fcd6605cd8638ce14f15e41b878add3f1c 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java |