diff options
| author | Jason Penilla <[email protected]> | 2024-04-27 14:11:35 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-04-27 14:11:35 -0700 |
| commit | 20af7a753c36ef970ccf9e62d9ccfb769cf59e69 (patch) | |
| tree | 1e8d6103f9568536a376ab8a670b95f7fff99cd9 | |
| parent | a390119b0482028178dae4bd7089c7080d4af9b5 (diff) | |
| download | Paper-20af7a753c36ef970ccf9e62d9ccfb769cf59e69.tar.gz Paper-20af7a753c36ef970ccf9e62d9ccfb769cf59e69.zip | |
remove funny diff
| -rw-r--r-- | patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch | 13 | ||||
| -rw-r--r-- | patches/server/0762-Call-BlockPhysicsEvent-more-often.patch | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch index 817d23fa98..9b0a69a94b 100644 --- a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch +++ b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch @@ -380,19 +380,6 @@ index 242811578a786e3807a1a7019d472d5a68f87116..0b65fdf53124f3dd042b2363b1b8df8e if (GlobalConfiguration.get() != null && !GlobalConfiguration.get().logging.deobfuscateStacktraces) { // handle null as true return traceElements; } -diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -index 457a963ee6ebd3cf5c3831f6660e3850335af49f..61744d8fde3ba98585cf261fc09f0acc042b67b8 100644 ---- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -@@ -128,7 +128,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater { - } - } - -- interface NeighborUpdates { -+ public interface NeighborUpdates { // Paper - TODO make package-private again (it is just made public for testing LambdaMetafactory remapping) - boolean runNext(Level world); - } - diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java index 8420a53672cfb0f060d9c85c445d200b6701f521..fc04bfcb8b5dfa6d093c8d75b2f20c502ef94a63 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java diff --git a/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch index b2dc803286..1839fbe711 100644 --- a/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch +++ b/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call BlockPhysicsEvent more often diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -index 61744d8fde3ba98585cf261fc09f0acc042b67b8..c0adfa72a6b43b72825797572c5c2557042e2a42 100644 +index 457a963ee6ebd3cf5c3831f6660e3850335af49f..106af2b2c7ff72c7549975aef75cdcff8d9a7d97 100644 --- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java +++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java @@ -119,7 +119,20 @@ public class CollectingNeighborUpdater implements NeighborUpdater { |