diff options
| author | Aikar <[email protected]> | 2020-08-02 01:39:36 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-08-02 01:39:36 -0400 |
| commit | 9788250b1090713057c6ca39827f52c463fee11c (patch) | |
| tree | 9cb7add4dc5610a8eb779f6715ae79cc698e65d9 /Spigot-Server-Patches/0399-Optimize-Hoppers.patch | |
| parent | 58a745eba0beeec4f080256330261c505b8e1a66 (diff) | |
| download | Paper-9788250b1090713057c6ca39827f52c463fee11c.tar.gz Paper-9788250b1090713057c6ca39827f52c463fee11c.zip | |
Clean up a lot of obfuscation helpers and impls
This fixes a bug with obfuscation helpers for attack cooldown
But every other change should stay the same.
Cleaning up a lot of helpers that pointed to already unobfuscated items.
Also adds final to many of the obfhelpers to assist with inlining.
This is pretty much a patch maintenance
Diffstat (limited to 'Spigot-Server-Patches/0399-Optimize-Hoppers.patch')
| -rw-r--r-- | Spigot-Server-Patches/0399-Optimize-Hoppers.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0399-Optimize-Hoppers.patch b/Spigot-Server-Patches/0399-Optimize-Hoppers.patch index f65a9c19df..b7851eecda 100644 --- a/Spigot-Server-Patches/0399-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0399-Optimize-Hoppers.patch @@ -73,7 +73,7 @@ index dea478d4790be0c0d6e14cd7673d161abfc46e08..d1e4ee64aa395b38cad22f316308c468 itemstack.d(this.D()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 41c4b2df34faa95afdd2d35b0bac021d77c56884..67ab908879146c83bf591ae9956d0c038fb5c5d9 100644 +index 6e67b4e1afd1425a99de8b27a9072cde0bbedf69..529721fb2f7da134957e2fee437dc159d40d1747 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1247,6 +1247,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -459,7 +459,7 @@ index a0a3adac3e2bc939b1809c5587929f674f4318a5..20df9bd21d0e4d2579d05d79672da2eb if (!list.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index e00ae999194f96fb4de556518abe495432a43a62..55b1e5da2b5128e479dbdf14eb1da692af1880fe 100644 +index 006f8bace83ba1e540399b3f05952fa5edb0681f..badf8e136ec3e45870c29e154cd4a855546c7530 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -77,12 +77,19 @@ public abstract class TileEntityLootable extends TileEntityContainer { @@ -485,10 +485,10 @@ index e00ae999194f96fb4de556518abe495432a43a62..55b1e5da2b5128e479dbdf14eb1da692 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4c717afe243997e153a8ef5f703d8409bf126222..a9aad7045cf67cca765500ebad4db9af3cf17262 100644 +index 57f544eb6b2e3362b62e8541642bfc88419ab596..325d7a313cfab72978f5c8fada1af6f19cdab239 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1139,8 +1139,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1134,8 +1134,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return list; } |