aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0715-Custom-Potion-Mixes.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-01-27 11:21:18 -0800
committerGitHub <[email protected]>2024-01-27 20:21:18 +0100
commit3841722fe1ed1cc48c489265967bd39bc2984dc1 (patch)
tree5b78020ab6bc090afe4f14481e90c76fab32fc93 /patches/server/0715-Custom-Potion-Mixes.patch
parent0cc3a7ec6be29df36f492153f3d2a10a8515c79d (diff)
downloadPaper-3841722fe1ed1cc48c489265967bd39bc2984dc1.tar.gz
Paper-3841722fe1ed1cc48c489265967bd39bc2984dc1.zip
Properly check if a loot table exists (#10190)
Diffstat (limited to 'patches/server/0715-Custom-Potion-Mixes.patch')
-rw-r--r--patches/server/0715-Custom-Potion-Mixes.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0715-Custom-Potion-Mixes.patch b/patches/server/0715-Custom-Potion-Mixes.patch
index c879f50bfb..4468cf31b7 100644
--- a/patches/server/0715-Custom-Potion-Mixes.patch
+++ b/patches/server/0715-Custom-Potion-Mixes.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 831594402c2c7d6aa72b303fb73fde62160c95e3..c0353463f59ae4d3fe94ee15feb95a4ec1a064f4 100644
+index d81fa8c7049bb6284865f249cc808caac7d5f65e..011d688fc0be45a8d1f65ebedcc5291bb109def2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2081,6 +2081,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -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 b578f3666291bf0ec9b9620e6212d39c33399a9e..506145875fae3da90662315a71eddda9aaabb0c3 100644
+index ab5e98c3b7c7b3d5b2108be87e6465cc7a6f3d2c..2bc4cfb1abd8a82228d1958fde2fd92e10c199b1 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 b578f3666291bf0ec9b9620e6212d39c33399a9e..506145875fae3da90662315a71eddda9
// Ugly hack :(
if (!Main.useConsole) {
-@@ -3069,5 +3070,10 @@ public final class CraftServer implements Server {
+@@ -3067,5 +3068,10 @@ public final class CraftServer implements Server {
return datapackManager;
}