Skip to content

Commit ab8264e

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b14d336 Apply watchdoge patches
1 parent abdb5b6 commit ab8264e

30 files changed

+149
-149
lines changed

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.3-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.3
5-
paperCommit = be2edeac2b42ab3d76d9462cd7fab584e13dee9c
5+
paperCommit = b14d336442a1928e21ad2eb28768bd0632961682
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

‎patches/server/0001-Rebrand.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..a6e5950b5875cafd734300cdfbf58f5d
184184

185185
@Override
186186
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
187-
index 589a8bf75be6ccc59f1e5dd5d8d9afed41c4772d..7eabcb453ef655741c4802d2f574932d6d741631 100644
187+
index b24265573fdef5d9a964bcd76146f34542c420cf..710477ae27ebc5afdf0012ef0867d05efd293c24 100644
188188
--- a/src/main/java/net/minecraft/CrashReport.java
189189
+++ b/src/main/java/net/minecraft/CrashReport.java
190190
@@ -32,6 +32,7 @@ public class CrashReport {
@@ -293,10 +293,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..99597258e8e88cd9e2c901c4ac3ff7fa
293293

294294
if (stream != null) {
295295
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
296-
index 529df2a41dd93d6e1505053bd04032dbf0cdaa31..c0aa9f4bfaa1d6fb81823363e3ac3f1ff06efc3d 100644
296+
index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..f51cc3de3ca935ef90f7f0e9dd0506b856fc55f3 100644
297297
--- a/src/main/java/org/spigotmc/WatchdogThread.java
298298
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
299-
@@ -23,7 +23,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
299+
@@ -96,7 +96,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
300300

301301
private WatchdogThread(long timeoutTime, boolean restart)
302302
{
@@ -305,7 +305,7 @@ index 529df2a41dd93d6e1505053bd04032dbf0cdaa31..c0aa9f4bfaa1d6fb81823363e3ac3f1f
305305
this.timeoutTime = timeoutTime;
306306
this.restart = restart;
307307
earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
308-
@@ -80,14 +80,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
308+
@@ -155,14 +155,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
309309
if (isLongTimeout) {
310310
// Paper end
311311
log.log( Level.SEVERE, "------------------------------" );
@@ -323,7 +323,7 @@ index 529df2a41dd93d6e1505053bd04032dbf0cdaa31..c0aa9f4bfaa1d6fb81823363e3ac3f1f
323323
//
324324
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
325325
{
326-
@@ -109,12 +109,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
326+
@@ -184,12 +184,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
327327
// Paper end
328328
} else
329329
{
@@ -336,9 +336,9 @@ index 529df2a41dd93d6e1505053bd04032dbf0cdaa31..c0aa9f4bfaa1d6fb81823363e3ac3f1f
336336
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
337337
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
338338
ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
339+
this.dumpTickingInfo(); // Paper - log detailed tick information
339340
WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
340-
log.log( Level.SEVERE, "------------------------------" );
341-
@@ -129,7 +129,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
341+
@@ -205,7 +205,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
342342
WatchdogThread.dumpThread( thread, log );
343343
}
344344
} else {

‎patches/server/0002-Purpur-config-files.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
55

66

77
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
8-
index 6aaed8e8bf8c721fc834da5c76ac72a4c3e92458..308d80ca27aa0edd63fba87343b12b39675462bc 100644
8+
index 4b002e8b75d117b726b0de274a76d3596fce015b..8cde30544e14f8fc2dac32966ae3c21f8cf3a551 100644
99
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
1010
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
11-
@@ -588,7 +588,7 @@ public class Metrics {
11+
@@ -593,7 +593,7 @@ public class Metrics {
1212
boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
1313
// Only start Metrics, if it's enabled in the config
1414
if (config.getBoolean("enabled", true)) {
@@ -17,7 +17,7 @@ index 6aaed8e8bf8c721fc834da5c76ac72a4c3e92458..308d80ca27aa0edd63fba87343b12b39
1717

1818
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
1919
String minecraftVersion = Bukkit.getVersion();
20-
@@ -597,16 +597,8 @@ public class Metrics {
20+
@@ -602,16 +602,8 @@ public class Metrics {
2121
}));
2222

2323
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
@@ -72,7 +72,7 @@ index 13bd145b1e8006a53c22f5dc0c78f29b540c7663..ae2d9c91afe13d07fd0de6d455b90a2a
7272
boolean flag1 = this.source.acceptsSuccess() && !this.silent;
7373
boolean flag2 = broadcastToOps && this.source.shouldInformAdmins() && !this.silent;
7474
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
75-
index 3ed19896a0e06fe834953e6450f23abdc805a6cc..11f708ec623bba462fce8bc9c4483f855fe48366 100644
75+
index 7a79541db29cc47c844d617fc8a4360f61c73372..3267240e8be56a6dc152805c23269f47ab0f54df 100644
7676
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
7777
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
7878
@@ -235,6 +235,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -92,7 +92,7 @@ index 3ed19896a0e06fe834953e6450f23abdc805a6cc..11f708ec623bba462fce8bc9c4483f85
9292

9393
this.setPvpAllowed(dedicatedserverproperties.pvp);
9494
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
95-
index bb2d3ba2065b6bf67af24a8630ac2d58169fe783..caa01dd419da2e18ad027e5eab828d8bcaca0279 100644
95+
index 044985030607bc20a61666dee7dd2659ae4553b5..580ddacce37e50e392999d45fdfa9f42f555aa6a 100644
9696
--- a/src/main/java/net/minecraft/world/level/Level.java
9797
+++ b/src/main/java/net/minecraft/world/level/Level.java
9898
@@ -174,6 +174,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

‎patches/server/0006-Component-related-conveniences.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ index eb6f95a37b26ac077423accc93492d9957456a1a..f00e708fe38454e228cf126199651b81
3636
public void displayClientMessage(Component message, boolean overlay) {
3737
this.sendSystemMessage(message, overlay);
3838
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
39-
index bbefb529607d1cffe8917b883389494a8fa126c0..a4454289fb92cf7b97ee77db422c328f008521f1 100644
39+
index 511e7254d938733aca508efd5de82e61678c7620..75e5e540f03d28b64fa5fef1f342a157598c3fa7 100644
4040
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
4141
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
4242
@@ -985,6 +985,20 @@ public abstract class PlayerList {
@@ -81,10 +81,10 @@ index bb1a60180e58c1333e7bb33e8acf1b0225eda8a8..c83e80ebdbbfb2d0e08561a44486a308
8181
return this.type().msgId();
8282
}
8383
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
84-
index b36a915e6d337d7ec3f797bf1773b14c5b231d76..3ca09f9ac97ad835feae8800a72d882af2192077 100644
84+
index 6817015f0cf39df03029e36cd845d590618031dc..62af796b2b883856a904647f504ff064a5fed463 100644
8585
--- a/src/main/java/net/minecraft/world/entity/Entity.java
8686
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
87-
@@ -4426,6 +4426,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
87+
@@ -4468,6 +4468,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
8888
return SlotAccess.NULL;
8989
}
9090

‎patches/server/0007-Ridables.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index f58a94efafbc01d402cd03a108bb90f60930a316..21ea63da99c5b3e2e1ab9cc1049c903b
2222
super(x, y, z);
2323
}
2424
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
25-
index 38060a14181f6bcbd36ee4c91fdb20fae30c534a..000a765c2e62d7e1921b2f4b4de77fc1a56ca02b 100644
25+
index 79f3dc4f53dce892c4756b0850352e0ca2eb95a6..dc9e3f798bc8a9a6968a588a09122a08dc9b9774 100644
2626
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
2727
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
28-
@@ -1805,6 +1805,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
28+
@@ -1848,6 +1848,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2929
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
3030
worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
3131
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
@@ -34,7 +34,7 @@ index 38060a14181f6bcbd36ee4c91fdb20fae30c534a..000a765c2e62d7e1921b2f4b4de77fc1
3434
gameprofilerfiller.push(() -> {
3535
String s = String.valueOf(worldserver);
3636
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
37-
index 3b55367865b3583e11ef886678114d4d4b294e8c..fc400624a9896f8fd29984c21df70e67b0c32c1d 100644
37+
index a7420e4522e0dff72ce7f8a791b9cd4bfa270106..0fa5e0c80ad09e03452c4d412390cb8f52060c01 100644
3838
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
3939
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
4040
@@ -231,6 +231,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -79,7 +79,7 @@ index eef96e946b80064fe211039a65db4192ea7a52d3..352ade7acc9052e4d74ef840e085a86f
7979
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
8080
entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
8181
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
82-
index 3ca09f9ac97ad835feae8800a72d882af2192077..a897a9f371d44cc6d1fcc19f2da5450e61858527 100644
82+
index 62af796b2b883856a904647f504ff064a5fed463..49a8b0d4f4a18c91a48291c316c420bd78428ca5 100644
8383
--- a/src/main/java/net/minecraft/world/entity/Entity.java
8484
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
8585
@@ -383,7 +383,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -91,7 +91,7 @@ index 3ca09f9ac97ad835feae8800a72d882af2192077..a897a9f371d44cc6d1fcc19f2da5450e
9191
private float eyeHeight;
9292
public boolean isInPowderSnow;
9393
public boolean wasInPowderSnow;
94-
@@ -3287,6 +3287,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
94+
@@ -3329,6 +3329,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
9595
this.passengers = ImmutableList.copyOf(list);
9696
}
9797

@@ -105,7 +105,7 @@ index 3ca09f9ac97ad835feae8800a72d882af2192077..a897a9f371d44cc6d1fcc19f2da5450e
105105
this.gameEvent(GameEvent.ENTITY_MOUNT, passenger);
106106
}
107107
}
108-
@@ -3326,6 +3333,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
108+
@@ -3368,6 +3375,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
109109
return false;
110110
}
111111
// CraftBukkit end
@@ -120,7 +120,7 @@ index 3ca09f9ac97ad835feae8800a72d882af2192077..a897a9f371d44cc6d1fcc19f2da5450e
120120
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
121121
this.passengers = ImmutableList.of();
122122
} else {
123-
@@ -5297,4 +5312,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
123+
@@ -5343,4 +5358,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
124124
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
125125
}
126126
// Paper end - Expose entity id counter

‎patches/server/0013-Configurable-server-mod-name.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
55

66

77
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
8-
index 000a765c2e62d7e1921b2f4b4de77fc1a56ca02b..a95f3032d498c9f71aa89fcfdda1081ae6fca3bd 100644
8+
index dc9e3f798bc8a9a6968a588a09122a08dc9b9774..99b1c6f239a85eb82019a1bae9e91391fcb55519 100644
99
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
1010
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
11-
@@ -1968,7 +1968,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -2011,7 +2011,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212

1313
@DontObfuscate
1414
public String getServerModName() {

‎patches/server/0014-Lagging-threshold.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
55

66

77
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
8-
index a95f3032d498c9f71aa89fcfdda1081ae6fca3bd..a75972eb4a4ad285982bb6dc5faf661123df9817 100644
8+
index 99b1c6f239a85eb82019a1bae9e91391fcb55519..a0bcb0fccadbf946e4c4bc0bbb8a1460532c636b 100644
99
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
1010
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
1111
@@ -329,6 +329,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -14,9 +14,9 @@ index a95f3032d498c9f71aa89fcfdda1081ae6fca3bd..a75972eb4a4ad285982bb6dc5faf6611
1414
public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
1515
+ public boolean lagging = false; // Purpur
1616

17-
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
18-
AtomicReference<S> atomicreference = new AtomicReference();
19-
@@ -1269,6 +1270,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
17+
public volatile Thread shutdownThread; // Paper
18+
public volatile boolean abnormalExit = false; // Paper
19+
@@ -1299,6 +1300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2020
this.recentTps[0] = tps1.getAverage();
2121
this.recentTps[1] = tps5.getAverage();
2222
this.recentTps[2] = tps15.getAverage();

‎patches/server/0031-Add-option-to-set-armorstand-step-height.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index e8f21091fe1d6043dcc4588d571f20f7bbda0901..fc40e7ec07b7741d12095a25a8408f030904eab8 100644
8+
index 01ee2cecacd9309d2eb5dd47b76b825db8d52d80..809ab6aaf50e573099dfb4ef839e3c2825cb7793 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -343,6 +343,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index e8f21091fe1d6043dcc4588d571f20f7bbda0901..fc40e7ec07b7741d12095a25a8408f03
1616
public boolean noPhysics;
1717
private boolean wasOnFire;
1818
public final RandomSource random;
19-
@@ -5111,7 +5112,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
19+
@@ -5157,7 +5158,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
2020
}
2121

2222
public float maxUpStep() {

‎patches/server/0043-Configurable-TPS-Catchup.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
55

66

77
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
8-
index a75972eb4a4ad285982bb6dc5faf661123df9817..8719173e50ec2313cb44905b52e5dbe7fb264374 100644
8+
index a0bcb0fccadbf946e4c4bc0bbb8a1460532c636b..fd37f9256c1b2d396e855e1167a1f2ca473d58d2 100644
99
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
1010
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
11-
@@ -1309,6 +1309,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -1339,6 +1339,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212
gameprofilerfiller.popPush("nextTickWait");
1313
this.mayHaveDelayedTasks = true;
1414
this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);

‎patches/server/0047-Allow-leashing-villagers.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow leashing villagers
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index fc40e7ec07b7741d12095a25a8408f030904eab8..f573cbaa5bf7bc12d6e9405010bf50c13727b350 100644
8+
index 809ab6aaf50e573099dfb4ef839e3c2825cb7793..e4293aea8564372d29cc7076b0efdb5e957c8d9d 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
11-
@@ -3083,6 +3083,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
11+
@@ -3125,6 +3125,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
1212
if (this.isAlive() && this instanceof Leashable leashable) {
1313
if (leashable.getLeashHolder() == player) {
1414
if (!this.level().isClientSide()) {

0 commit comments

Comments
 (0)