Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: 020f18aaa6 fix: promote slf4j-api to api scope (#6343) c815948b6d Fix ITEM_DROPPED stat not working properly (#6331) 9a125eecb8 Fix Incorrectly Typed Goals (#6200) 23e3a0ccb6 Add PlayerSetSpawnEvent (#5690) 00028d57cf call EntityDamageByBlockEvent for campfires (#6244) 9b4a46f704 [ci skip] add vs code files to .gitignore (#5663) a178fb895e Make hoppers respect inventory max stack size (#4838) 4a2f53c6e8 Add missing DamageCause for EntityDamageByBlockEvent (#6352) f261419fd5 clone itemstack to return remaining stack (#6353)
2026-02-17 16:37:43 +01:00 · 2021-08-07 19:10:45 -05:00
parent 661cc4bd82
commit b0f215162b
8 changed files with 23 additions and 23 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1

-paperCommit = f521a18a17f32997793b2d0b2ebcd7890f200fc8
+paperCommit = f261419fd5eeb771d0850918dd586501e60d2e51

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0002-Build-System-Changes.patch
+++ b/patches/api/0002-Build-System-Changes.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 15b8f4708887535383bb74bd922f893231737599..8d19658eb77565524f6d36debcb7629db56f04c6 100644
+index d69d367a7527d677661ea56453b95417748b70a9..206ac6d91e9935c12e65244fe5ed9c168781eb6b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -27,6 +27,7 @@ dependencies {
-     api("net.kyori:adventure-text-serializer-legacy")
+@@ -28,6 +28,7 @@ dependencies {
     api("net.kyori:adventure-text-serializer-plain")
     api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
+     api("org.slf4j:slf4j-api:1.7.30") // Paper
 +    api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur
 
     implementation("org.ow2.asm:asm:9.1")
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -46,7 +46,7 @@ index f9ed48f5bbde84fd1804e482f2777b516cc3a1ef..29b841462037fa97f72971c490b617d1
         return new Throwable(entity + " Added to world at " + new java.util.Date());
     }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3802a1dc3997704031d22165f60f854f50bda9d6..871b006b99d3872bc8a5a238227a1624fc493eac 100644
+index 660f7fbbdd88b8eb2b58aed03925ee63db924a7c..ce796a2cc083ffc5497cdb3bac9da87ea4ba94a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -665,6 +665,15 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 3802a1dc3997704031d22165f60f854f50bda9d6..871b006b99d3872bc8a5a238227a1624
     }
 
     public void doTick() {
-@@ -2416,4 +2425,6 @@ public class ServerPlayer extends Player {
+@@ -2437,4 +2446,6 @@ public class ServerPlayer extends Player {
         return (CraftPlayer) super.getBukkitEntity();
     }
     // CraftBukkit end
@@ -5752,7 +5752,7 @@ index 8ce49478441e77cedf5148ecb81d78b32660329e..fb5cd6fe7903f3f96af1abb55832bafb
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6d4eaa498 100644
+index 622a0f23db838b839f76722df0e5480ec927b4a2..98e0c1e64d23552b8e8de5e17cee09fc0cb08d5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -537,6 +537,15 @@ public class CraftEventFactory {
@@ -5779,7 +5779,7 @@ index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6
             }
             event.setCancelled(cancelled);
 
-@@ -1042,6 +1052,7 @@ public class CraftEventFactory {
+@@ -1046,6 +1056,7 @@ public class CraftEventFactory {
             if (!event.isCancelled()) {
                 event.getEntity().setLastDamageCause(event);
             }
@@ -5787,7 +5787,7 @@ index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6
             return event;
         }
 
-@@ -1093,6 +1104,7 @@ public class CraftEventFactory {
+@@ -1097,6 +1108,7 @@ public class CraftEventFactory {
         EntityDamageEvent event;
         if (damager != null) {
             event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
--- a/patches/server/0020-Player-invulnerabilities.patch
+++ b/patches/server/0020-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 934d24bae4a5d6780434a0918c04dfffc12f2364..da8a924faf6ed16f2cf669439f5ba1175b1b8cc0 100644
+index ee9ce98995a3130938bd09d8d0ec4855e4419829..3dbb4b7bd25274c7e72ffcb6e12aae06b31b5530 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
@@ -62,7 +62,7 @@ index 934d24bae4a5d6780434a0918c04dfffc12f2364..da8a924faf6ed16f2cf669439f5ba117
         this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
     }
 
-@@ -2426,9 +2436,17 @@ public class ServerPlayer extends Player {
+@@ -2447,9 +2457,17 @@ public class ServerPlayer extends Player {
 
     @Override
     public boolean isImmobile() {
@@ -108,7 +108,7 @@ index f6a091ab2f549761b8d19fb35e1db907954a9717..e4b9edb4226ce3213181b6deb2fca6e9
         this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
         // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6cb325b098fe64b746940ce79fd927320ec444e6..ac68314c5c2de8376e11abd95b50b4b0bd2c00eb 100644
+index 1bbb3f0658628ec36cd9e177df3acc07ef107428..3f8dc9192287d6eb3f966e0d8d4fdee82c753724 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -998,6 +998,8 @@ public abstract class PlayerList {
@@ -141,7 +141,7 @@ index dc3dcf7946d2b31784b31d31c01670b81e626eed..b1b2e96804eb9e736e634a75882dc404
 
     public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5c9aa0e2e5a9e6a671fdc8d51f94529736b6dbbf..e9b440d1ec4a0c8155c80ee88e76b462a1bfdb06 100644
+index 96c515506a2613d622afc28d902281c0b702c309..de370ef508e72e16e43b872cbad032b414b6cf62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2565,5 +2565,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0084-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 39f3b87b8b07f9ea0748f31419fd78e3911e97b1..f60d7aa4ddfb9b0889b4509c5844812219ce4121 100644
+index 73028657f5e579d38782bd4a8cecb351d4bcbdb9..da5669ca796dcac29005ae5e90e2b0532a56a92f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2496,5 +2496,25 @@ public class ServerPlayer extends Player {
+@@ -2517,5 +2517,25 @@ public class ServerPlayer extends Player {
     }
     // CraftBukkit end
 
--- a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
@@ -33,7 +33,7 @@ index 3e04510519ca5d03eb16aab8b1094e24101cebf4..12a3304c3b465f2a9d7cf279ea7b945b
                     if (flag5) {
                         if (i > 0) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f41a91a06f 100644
+index 98e0c1e64d23552b8e8de5e17cee09fc0cb08d5c..5608ee1125c41d055e2827ab8a801e704ebb0441 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -967,7 +967,7 @@ public class CraftEventFactory {
@@ -45,7 +45,7 @@ index 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f4
                 damager.processClick(InteractionHand.MAIN_HAND); // Purpur
             }
             event.setCancelled(cancelled);
-@@ -1046,7 +1046,7 @@ public class CraftEventFactory {
+@@ -1050,7 +1050,7 @@ public class CraftEventFactory {
             } else {
                 throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
             }
@@ -54,7 +54,7 @@ index 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f4
             event.setCancelled(cancelled);
             CraftEventFactory.callEvent(event);
             if (!event.isCancelled()) {
-@@ -1103,7 +1103,7 @@ public class CraftEventFactory {
+@@ -1107,7 +1107,7 @@ public class CraftEventFactory {
     private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
         EntityDamageEvent event;
         if (damager != null) {
--- a/patches/server/0142-Implement-TPSBar.patch
+++ b/patches/server/0142-Implement-TPSBar.patch
@@ -42,7 +42,7 @@ index fc6a6e88486c5c2dca1b10bfeae24124690d7b8d..7b66b301b10158e9c715834b24bdfab1
         }
     }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2b38cfc74840bd3bab6312a72973e301d09fcde4..b88c7eac66248f82d6d7108dbec09bdd431f9e69 100644
+index 46f8c78916b1a81b6429d557bb398217f6f5f752..98584609ed1ba2bc4cc803482326fa1525a779bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -69,7 +69,7 @@ index 2b38cfc74840bd3bab6312a72973e301d09fcde4..b88c7eac66248f82d6d7108dbec09bdd
     }
 
     // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2525,5 +2528,13 @@ public class ServerPlayer extends Player {
+@@ -2546,5 +2549,13 @@ public class ServerPlayer extends Player {
             this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
         }
     }
@@ -84,7 +84,7 @@ index 2b38cfc74840bd3bab6312a72973e301d09fcde4..b88c7eac66248f82d6d7108dbec09bdd
     // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 29043f9354b29f7766f1d6d8e793e2ea23883fa0..9a0065bd8eeb758daeb49d82ba8f2c09a6e4f533 100644
+index 2381d75295554c0310e36a26f5332063b126adc9..a387b3b5aa510dcd99d71446d723ce79c82dad33 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -483,6 +483,7 @@ public abstract class PlayerList {
--- a/patches/server/0237-Add-compass-command.patch
+++ b/patches/server/0237-Add-compass-command.patch
@@ -17,7 +17,7 @@ index 528fd87ae1c1c01e13885d88fc8056b0f932fb61..bfad241892b8280d261ab8301245b91b
 
         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 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd959f49ca36 100644
+index b2bf0ce295520e7dc6f17fd904769e47164675eb..023b3df9b375aa8f91a5f2e7d3592482afac7c0e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd95
     }
 
     // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2538,5 +2541,13 @@ public class ServerPlayer extends Player {
+@@ -2559,5 +2562,13 @@ public class ServerPlayer extends Player {
     public void tpsBar(boolean tpsBar) {
         this.tpsBar = tpsBar;
     }