diff options
| author | Nassim Jahnke <[email protected]> | 2024-01-24 11:45:17 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-01-24 11:45:17 +0100 |
| commit | 11645e32689f9b2872d064e9c8d8199bc34e0354 (patch) | |
| tree | 106704976a2c5ae8af3f2f1845d3da510f025f9c /patches/server/0715-Custom-Potion-Mixes.patch | |
| parent | 76da4bc683a51057eadfabc6e6694486a20a0d20 (diff) | |
| download | Paper-11645e32689f9b2872d064e9c8d8199bc34e0354.tar.gz Paper-11645e32689f9b2872d064e9c8d8199bc34e0354.zip | |
[ci skip] (Mostly) finish adding identifying patch comments
Diffstat (limited to 'patches/server/0715-Custom-Potion-Mixes.patch')
| -rw-r--r-- | patches/server/0715-Custom-Potion-Mixes.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0715-Custom-Potion-Mixes.patch b/patches/server/0715-Custom-Potion-Mixes.patch index e2a88e9c70..2b244484dd 100644 --- a/patches/server/0715-Custom-Potion-Mixes.patch +++ b/patches/server/0715-Custom-Potion-Mixes.patch @@ -32,10 +32,10 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5a1c19f7964f282217097d94c0a9e3cc376f70fd..35053ad6cdb071d3f256a23d532d1abb77f14858 100644 +index 77b7c6be67068763d556cebdb2ca7f696ce3c950..2968e4253bb4eed39b28db3f3c87d31e4834540b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2087,6 +2087,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -2027,6 +2027,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa this.worldData.setDataConfiguration(worlddataconfiguration); this.resources.managers.updateRegistryTags(this.registryAccess()); @@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..bc01481ac5990ad1cfd1def5a16dd0ed @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2ef62cc94b8884b4e7e70f9ca926a0c6cd82e321..3651cdff8b5a489d57ffd39470510e0f2e413f71 100644 +index aba1755b198ea85823b514d535c9fd8864c10fab..47227668f3f48314a89d96631b7a8a0e3c882a61 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -304,6 +304,7 @@ public final class CraftServer implements Server { @@ -192,7 +192,7 @@ index 2ef62cc94b8884b4e7e70f9ca926a0c6cd82e321..3651cdff8b5a489d57ffd39470510e0f // Ugly hack :( if (!Main.useConsole) { -@@ -3076,5 +3077,10 @@ public final class CraftServer implements Server { +@@ -3065,5 +3066,10 @@ public final class CraftServer implements Server { return datapackManager; } |