Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d3c1023 fix player loottables running when mob loot gamerule is false (#7651)
This commit is contained in:
BillyGalbreath
2022-03-30 08:48:14 -05:00
parent 104c214368
commit 47cb2cef8e
13 changed files with 29 additions and 29 deletions

View File

@@ -17,7 +17,7 @@ index 9e7cc8bf867b6e4f86b55e1f1d3a1cb6233c90f1..7c30d8d61a8e82d8a1f61451090e9bbb
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 96c5a7aa62703467a0325d5203ff21a8f6e3fc07..43dbd3d233a6f0f9f762fb68e81ad49b9c9e6dab 100644
index 0e00b778eb012f51188b1c9a1240e5a4f1704e75..a5617b0f34e842302e86be3c46479855a2d6d5e1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -255,6 +255,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 96c5a7aa62703467a0325d5203ff21a8f6e3fc07..43dbd3d233a6f0f9f762fb68e81ad49b
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2579,5 +2582,13 @@ public class ServerPlayer extends Player {
@@ -2581,5 +2584,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}