From 47cb2cef8e0f52f56f0166c7718e5cd7c4c8effe Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 30 Mar 2022 08:48:14 -0500 Subject: [PATCH] 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) --- gradle.properties | 2 +- .../server/0005-Component-related-conveniences.patch | 4 ++-- patches/server/0011-AFK-API.patch | 4 ++-- patches/server/0018-Player-invulnerabilities.patch | 12 ++++++------ .../0045-Minecart-settings-and-WASD-controls.patch | 4 ++-- ...n-to-teleport-to-spawn-if-outside-world-bor.patch | 4 ++-- .../server/0117-Add-boat-fall-damage-config.patch | 4 ++-- patches/server/0127-Implement-TPSBar.patch | 4 ++-- patches/server/0137-Fix-stuck-in-portals.patch | 4 ++-- ...-Config-to-ignore-nearby-mobs-when-sleeping.patch | 4 ++-- .../0174-Configurable-broadcast-settings.patch | 4 ++-- patches/server/0214-Add-compass-command.patch | 4 ++-- patches/server/0242-Signs-allow-color-codes.patch | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0f5f1ed2e..e8d506f51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = fa68bb1e816d8c7013dd2ce512724d8b4c8135a5 +paperCommit = d3c102373f90cffa1be2a19ce671d99d563ff9ca org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0005-Component-related-conveniences.patch b/patches/server/0005-Component-related-conveniences.patch index fb41bf96f..3073b4dbe 100644 --- a/patches/server/0005-Component-related-conveniences.patch +++ b/patches/server/0005-Component-related-conveniences.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b3459253bddd74ecda2b534d4bd6877b079a467f..4da6ef8affbec3fe3311a5c6282daf7f41ddccbc 100644 +index 773ed225c8611718a74648382eb2fbd6e72c32e2..ea7bbe0463858ebdf438f2aae40657f6682b7b06 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1691,6 +1691,26 @@ public class ServerPlayer extends Player { +@@ -1693,6 +1693,26 @@ public class ServerPlayer extends Player { } // CraftBukkit end diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch index 7d021d7c6..8398ab3b0 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0011-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2ec7392b94e6351190a72e59fac49a883a058752..b2e9d6a2ee654caa6e129d63a6e23f88252ad35d 100644 +index 3abb10c70b09c63462f0090a6b576ba2d6657cb8..89189f12f467b6b97569553d3af47b14068a6a23 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1967,8 +1967,58 @@ public class ServerPlayer extends Player { +@@ -1969,8 +1969,58 @@ public class ServerPlayer extends Player { public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 6abb6e50d..a46635951 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac7123753bc00 100644 +index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c41428d81 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -253,6 +253,7 @@ public class ServerPlayer extends Player { @@ -24,7 +24,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712 } // Paper start - Chunk priority public BlockPos getPointInFront(double inFront) { -@@ -1003,6 +1005,12 @@ public class ServerPlayer extends Player { +@@ -1005,6 +1007,12 @@ public class ServerPlayer extends Player { } @@ -37,7 +37,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712 @Override public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { -@@ -1010,7 +1018,7 @@ public class ServerPlayer extends Player { +@@ -1012,7 +1020,7 @@ public class ServerPlayer extends Player { } else { boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId); @@ -46,7 +46,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712 return false; } else { if (source instanceof EntityDamageSource) { -@@ -1183,6 +1191,7 @@ public class ServerPlayer extends Player { +@@ -1185,6 +1193,7 @@ public class ServerPlayer extends Player { } // Paper end @@ -54,7 +54,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712 return this; } } -@@ -1957,6 +1966,7 @@ public class ServerPlayer extends Player { +@@ -1959,6 +1968,7 @@ public class ServerPlayer extends Player { } public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) { @@ -62,7 +62,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712 this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt)); } -@@ -2466,9 +2476,17 @@ public class ServerPlayer extends Player { +@@ -2468,9 +2478,17 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { diff --git a/patches/server/0045-Minecart-settings-and-WASD-controls.patch b/patches/server/0045-Minecart-settings-and-WASD-controls.patch index c9805f90b..20701f1aa 100644 --- a/patches/server/0045-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0045-Minecart-settings-and-WASD-controls.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d86def0cc42af5ccfef69ff43ffac7123753bc00..6721da5ec6ea4fc10cee4658b51e9a1b795eb8b9 100644 +index 3697b25a60811e4b73d281b49e47d61c41428d81..7cedd4545f167edb36e6c0945cbf596b574035fe 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1016,6 +1016,7 @@ public class ServerPlayer extends Player { +@@ -1018,6 +1018,7 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index ceda8b5dd..ba33826af 100644 --- a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6721da5ec6ea4fc10cee4658b51e9a1b795eb8b9..a27663768a6c3ac71a4dd86286f8db5feba075ef 100644 +index 7cedd4545f167edb36e6c0945cbf596b574035fe..9329d24821021cb48789f30f267d53875714b922 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2536,4 +2536,26 @@ public class ServerPlayer extends Player { +@@ -2538,4 +2538,26 @@ public class ServerPlayer extends Player { // CraftBukkit end public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder diff --git a/patches/server/0117-Add-boat-fall-damage-config.patch b/patches/server/0117-Add-boat-fall-damage-config.patch index 50ac77c52..000d52151 100644 --- a/patches/server/0117-Add-boat-fall-damage-config.patch +++ b/patches/server/0117-Add-boat-fall-damage-config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a27663768a6c3ac71a4dd86286f8db5feba075ef..79066cbf1b5a35b75f0352f2df0fb0cd5c77a343 100644 +index 9329d24821021cb48789f30f267d53875714b922..4dd87157e667f9d6312713ea254a5f76597dd0b6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1016,7 +1016,16 @@ public class ServerPlayer extends Player { +@@ -1018,7 +1018,16 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0127-Implement-TPSBar.patch b/patches/server/0127-Implement-TPSBar.patch index bc7268c92..9c55721a0 100644 --- a/patches/server/0127-Implement-TPSBar.patch +++ b/patches/server/0127-Implement-TPSBar.patch @@ -41,7 +41,7 @@ index 0df8172bc3a5621c2d23b036ce2e5879650757b5..d185dfc8194aad9ed7d1a55817bb4c52 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 79066cbf1b5a35b75f0352f2df0fb0cd5c77a343..c5505098c6b75008736617f8d264a3e17516edf5 100644 +index 4dd87157e667f9d6312713ea254a5f76597dd0b6..80b67eb9c80db9bff4a5b697269fb5f971413f9c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -254,6 +254,7 @@ public class ServerPlayer extends Player { @@ -68,7 +68,7 @@ index 79066cbf1b5a35b75f0352f2df0fb0cd5c77a343..c5505098c6b75008736617f8d264a3e1 } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2566,5 +2569,13 @@ public class ServerPlayer extends Player { +@@ -2568,5 +2571,13 @@ public class ServerPlayer extends Player { this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck); } } diff --git a/patches/server/0137-Fix-stuck-in-portals.patch b/patches/server/0137-Fix-stuck-in-portals.patch index bcc31dc72..73934e440 100644 --- a/patches/server/0137-Fix-stuck-in-portals.patch +++ b/patches/server/0137-Fix-stuck-in-portals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c5505098c6b75008736617f8d264a3e17516edf5..3247fb348dbe59901d20dc2a99bb542d62563f05 100644 +index 80b67eb9c80db9bff4a5b697269fb5f971413f9c..af74a78ae1ea72e2a303821231c0537d40dd33b2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1169,6 +1169,7 @@ public class ServerPlayer extends Player { +@@ -1171,6 +1171,7 @@ public class ServerPlayer extends Player { playerlist.sendPlayerPermissionLevel(this); worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION); this.unsetRemoved(); diff --git a/patches/server/0146-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0146-Config-to-ignore-nearby-mobs-when-sleeping.patch index e5cce1fe4..fd5a10950 100644 --- a/patches/server/0146-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0146-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3247fb348dbe59901d20dc2a99bb542d62563f05..bf7aebfdb5f1778c2ed4cd8bb84edd2de8251acf 100644 +index af74a78ae1ea72e2a303821231c0537d40dd33b2..0ffedd9d501b4ca0e5965420069af2f92bbc65d0 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1319,7 +1319,7 @@ public class ServerPlayer extends Player { +@@ -1321,7 +1321,7 @@ public class ServerPlayer extends Player { return entitymonster.isPreventingPlayerRest(this); }); diff --git a/patches/server/0174-Configurable-broadcast-settings.patch b/patches/server/0174-Configurable-broadcast-settings.patch index 7bef4ef79..70fddfae5 100644 --- a/patches/server/0174-Configurable-broadcast-settings.patch +++ b/patches/server/0174-Configurable-broadcast-settings.patch @@ -17,10 +17,10 @@ index 048413655ef636b3dae687452fc5a95780058a22..f7f10a523cd08fddf1f14968cb1abd4a // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bf7aebfdb5f1778c2ed4cd8bb84edd2de8251acf..96c5a7aa62703467a0325d5203ff21a8f6e3fc07 100644 +index 0ffedd9d501b4ca0e5965420069af2f92bbc65d0..0e00b778eb012f51188b1c9a1240e5a4f1704e75 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -908,6 +908,7 @@ public class ServerPlayer extends Player { +@@ -910,6 +910,7 @@ public class ServerPlayer extends Player { }); Team scoreboardteambase = this.getTeam(); diff --git a/patches/server/0214-Add-compass-command.patch b/patches/server/0214-Add-compass-command.patch index 19a35b29e..34f3f54d0 100644 --- a/patches/server/0214-Add-compass-command.patch +++ b/patches/server/0214-Add-compass-command.patch @@ -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; } diff --git a/patches/server/0242-Signs-allow-color-codes.patch b/patches/server/0242-Signs-allow-color-codes.patch index 435ddc88c..3a2b178ae 100644 --- a/patches/server/0242-Signs-allow-color-codes.patch +++ b/patches/server/0242-Signs-allow-color-codes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 43dbd3d233a6f0f9f762fb68e81ad49b9c9e6dab..e217120cdfb35a631b488b784caeba14afd411c4 100644 +index a5617b0f34e842302e86be3c46479855a2d6d5e1..a8e5d4dff9ecd250a1d8991be9e4ee88bf7b28dd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1494,6 +1494,7 @@ public class ServerPlayer extends Player { +@@ -1496,6 +1496,7 @@ public class ServerPlayer extends Player { @Override public void openTextEdit(SignBlockEntity sign) {