diff options
| author | Jake Potrebic <[email protected]> | 2024-05-23 10:32:02 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-23 10:32:02 -0700 |
| commit | a9201d4a7daceede594c5b8453b50a86dd12306c (patch) | |
| tree | acf569d6bfdb49656b352ad11ab982395296fd43 /patches/server/0949-Add-Lifecycle-Event-system.patch | |
| parent | b14958485d88cdf2ba5e1ea4a7bc3171ba9a7de3 (diff) | |
| download | Paper-a9201d4a7daceede594c5b8453b50a86dd12306c.tar.gz Paper-a9201d4a7daceede594c5b8453b50a86dd12306c.zip | |
[ci skip] Move logic in our patches to ItemType/BlockType (#10772)
Diffstat (limited to 'patches/server/0949-Add-Lifecycle-Event-system.patch')
| -rw-r--r-- | patches/server/0949-Add-Lifecycle-Event-system.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0949-Add-Lifecycle-Event-system.patch b/patches/server/0949-Add-Lifecycle-Event-system.patch index fb9a2d78c8..d88744a2e2 100644 --- a/patches/server/0949-Add-Lifecycle-Event-system.patch +++ b/patches/server/0949-Add-Lifecycle-Event-system.patch @@ -707,7 +707,7 @@ index 2e96308696e131f3f013469a395e5ddda2c5d529..65a66e484c1c39c5f41d97db52f31c67 } catch (Throwable e) { LOGGER.error("Failed to run bootstrapper for %s. This plugin will not be loaded.".formatted(provider.getSource()), e); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d7178155e548eb027e75bb8e7f03d077cae6831e..34242fa907bb87ef78cf96ca81ae224de750956f 100644 +index ffb456ef6386eaaca3df3f36666e41f85210f88c..99a06496935489ff641c4db78e147d29466dc05a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1013,6 +1013,11 @@ public final class CraftServer implements Server { @@ -739,10 +739,10 @@ index d96399e9bf1a58db5a4a22e58abb99e7660e0694..66bdac50130f523f9dc4379b103b7a46 + // Paper end - lifecycle events } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 0e23219206d94308e0d5d1519d7f80678ffa4f73..89e4f53598c14ea2ca2b6678edc97366649d0145 100644 +index 053c09fa00d08b50aa25614a6310299efffe203a..b137d4518727bfb4a058abbf33e6cfd3b6e05772 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -672,6 +672,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -670,6 +670,13 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end - spawn egg color visibility |