Skip to content

Commit

Permalink
Update Paper
Browse files Browse the repository at this point in the history
  • Loading branch information
s-yh-china committed Sep 16, 2024
1 parent c33b547 commit 615efda
Show file tree
Hide file tree
Showing 39 changed files with 172 additions and 197 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group=org.leavesmc.leaves
version=1.21.1-R0.1-SNAPSHOT
mcVersion=1.21.1
paperRef=7c9240f4a63b13be1fdcedbfb0270f9b49b75518
paperRef=13a23951d7142c3c4c39bd5e9bddac190b90c151
preVersion=false
updatingMinecraft=false
org.gradle.jvmargs=-Xmx2G
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0001-Leaves-Server-Config.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config


diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c043d239c449bf4bb13a24467f2f6c67b4d28d2d..594deedd08c3b3255fe6838471d945759f09a182 100644
index 6246251caf2c6f025c824b8e7a944b8d48751fa1..80949894308e597676745e312474fe0c9672a23e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2253,6 +2253,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2264,6 +2264,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
throw new UnsupportedOperationException("Not supported yet.");
}
// Paper end
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0003-Add-fakeplayer-api.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ index 97e78e27ee0eea2c8b24886eeb19164d552323fe..9764fa643039f215627c20a33ca70c9e
/.factorypath
+
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..30cebbf2e194c56450328a7dc04c92c81edce284 100644
index e20e4239a5a1f952e1c70e899549989d5e42f73c..5f6078bc80e20c9482a96d2bf1095bb32fbfc28c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2906,6 +2906,17 @@ public final class Bukkit {
@@ -2917,6 +2917,17 @@ public final class Bukkit {
}
// Paper end - Folia region threading API

Expand All @@ -36,7 +36,7 @@ index 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..30cebbf2e194c56450328a7dc04c92c8
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 594deedd08c3b3255fe6838471d945759f09a182..6fa638198f75458177af795f00250ce970591315 100644
index 80949894308e597676745e312474fe0c9672a23e..133ae299ba12e0da9c5fa252a06bbf4f2b7b9016 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -62,6 +62,7 @@ import org.jetbrains.annotations.ApiStatus;
Expand All @@ -47,7 +47,7 @@ index 594deedd08c3b3255fe6838471d945759f09a182..6fa638198f75458177af795f00250ce9

/**
* Represents a server implementation.
@@ -2551,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2562,4 +2563,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0009-Replay-Mod-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ index 9764fa643039f215627c20a33ca70c9e36b2d599..97e78e27ee0eea2c8b24886eeb19164d
/.factorypath
-
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 30cebbf2e194c56450328a7dc04c92c81edce284..bdbfce47b1e04d0d1ddbbd75f41b7cc56154238f 100644
index 5f6078bc80e20c9482a96d2bf1095bb32fbfc28c..d0a9b96f4ab200892d589a68b27585a08780f7ac 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2916,6 +2916,11 @@ public final class Bukkit {
@@ -2927,6 +2927,11 @@ public final class Bukkit {
return server.getBotManager();
}
// Leaves end - Bot API
Expand All @@ -30,7 +30,7 @@ index 30cebbf2e194c56450328a7dc04c92c81edce284..bdbfce47b1e04d0d1ddbbd75f41b7cc5
@NotNull
public static Server.Spigot spigot() {
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6fa638198f75458177af795f00250ce970591315..df914ed9db06414cd59279ae1b9226c1cf69f113 100644
index 133ae299ba12e0da9c5fa252a06bbf4f2b7b9016..f752dbd0ed8a62cb2b7c812925dde645c3ecb85c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -63,6 +63,7 @@ import org.jetbrains.annotations.Contract;
Expand All @@ -41,7 +41,7 @@ index 6fa638198f75458177af795f00250ce970591315..df914ed9db06414cd59279ae1b9226c1

/**
* Represents a server implementation.
@@ -2561,4 +2562,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2572,4 +2573,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull BotManager getBotManager();
// Leaves end - Bot API
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0010-Bytebuf-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index bdbfce47b1e04d0d1ddbbd75f41b7cc56154238f..989bd5a0248b4fec9efbfc45b67871ede9a745bc 100644
index d0a9b96f4ab200892d589a68b27585a08780f7ac..7fbd9d2b533e8791132ba6ac21fad83d704922a0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2922,6 +2922,12 @@ public final class Bukkit {
@@ -2933,6 +2933,12 @@ public final class Bukkit {
}
// Leaves end - Photographer API

Expand All @@ -22,10 +22,10 @@ index bdbfce47b1e04d0d1ddbbd75f41b7cc56154238f..989bd5a0248b4fec9efbfc45b67871ed
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index df914ed9db06414cd59279ae1b9226c1cf69f113..d00b9e5f76d93335371f4999f972ecfe6c22aa13 100644
index f752dbd0ed8a62cb2b7c812925dde645c3ecb85c..90fbc5fb7b8936af365e8f4cbbd7bff6d1b4cf68 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2565,4 +2565,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2576,4 +2576,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Leaves start - Photographer API
@NotNull PhotographerManager getPhotographerManager();
// Leaves end - Photographer API
Expand Down
22 changes: 11 additions & 11 deletions patches/server/0003-Delete-Timings.patch
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ index 0c3c82b28e581286b798ee58ca4193efc2faff4a..fe6a5a6377bcb577b21471ae93639f8d
// return true as command was handled
return 1;
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..68c1fa35fccb98245dfb9f68ba14b1c16b13c5e1 100644
index 690086adcb1f87adc0b3ab664fde735ad3e1093a..959160c5859733d4029278054d9c970130d93ab8 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -1,6 +1,5 @@
Expand All @@ -751,7 +751,7 @@ index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..68c1fa35fccb98245dfb9f68ba14b1c1
import com.mojang.logging.LogUtils;
import io.papermc.paper.configuration.constraint.Constraints;
import io.papermc.paper.configuration.type.number.DoubleOr;
@@ -118,7 +117,6 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -119,7 +118,6 @@ public class GlobalConfiguration extends ConfigurationPart {

@PostProcess
private void postProcess() {
Expand Down Expand Up @@ -1008,7 +1008,7 @@ index 0b4a70ebd312038d5b128c9e1f990666d1642a1a..a108ebfe472c908e86e0af2cfd9cb630
// Paper start
if (waitableArray[0] != null) {
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 1e0a6e5a3c907ab55ee6f2780a7d43bd455f2b7b..460e3c572884db5862a3f6101cf44d900d77e43b 100644
index af8cb316ac169aa8d98a88765b85bb013b9ba961..50e79870db5424e47c9cb5f3866557008f580071 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1,6 +1,5 @@
Expand Down Expand Up @@ -1136,7 +1136,7 @@ index dcb5651d1d9b10b40430fb2f713beedf68336704..68e445c21e0acbdf6bb74d50ddd32e0e
gameprofilerfiller.pop();
gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 2fe9d9b38c01d04416843fdd48d3e33899b7de63..af57e7aefc757be8ed9e2238e1e01973f57bf091 100644
index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..2c509f2c5e6e6824392f1f90dde524ad2c0fc2cc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@
Expand Down Expand Up @@ -1331,7 +1331,7 @@ index 2fe9d9b38c01d04416843fdd48d3e33899b7de63..af57e7aefc757be8ed9e2238e1e01973
// Paper start - add close param
if (close) {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..f9141e1997ef88ff5478d4a01b6bc719125631f2 100644
index c13922d2fb1c15f895b14d4cb6d5379b59ea1ef8..9bb0dde8c3e6b3d17b3798a408658a8ffefd831f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,5 @@
Expand All @@ -1341,15 +1341,15 @@ index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..f9141e1997ef88ff5478d4a01b6bc719
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -1190,7 +1189,6 @@ public abstract class PlayerList {
@@ -1199,7 +1198,6 @@ public abstract class PlayerList {

public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
- MinecraftTimings.savePlayers.startTiming(); // Paper
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1201,7 +1199,6 @@ public abstract class PlayerList {
@@ -1210,7 +1208,6 @@ public abstract class PlayerList {
}
// Paper end - Incremental chunk and player saving
}
Expand Down Expand Up @@ -1386,7 +1386,7 @@ index cb61462d4691a055a4b25f7b953609d8a154fdfe..b2b97c4c61ea5b6f7ec199fabbd1bd1c
return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ccd9dff20a60f019e0c320acfb526b8bf3e5f806..d614e54f65a42360c827429ba647846bc6c27909 100644
index 30f4f1254fc295442d72d50479e8af635f2fe983..a0f6d383b430c8e320f041fe2221943830b021eb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
Expand Down Expand Up @@ -1539,10 +1539,10 @@ index e524b27d185da3e88668f8ef107517272860bd66..8205d34ed80781b2aab1fb2ef59986b9
}

diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index a7108b2be0746aa1f0e574d8c6f5ffad6d369835..3a68a32a359f13850262ac1ec07810053f806f7c 100644
index 29947de9eb6887f2e61516523ff08d8b581b0f53..ae86e1edde015e2ff6cd10c31e0a6065708241af 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -103,13 +103,6 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -102,13 +102,6 @@ public class Block extends BlockBehaviour implements ItemLike {
this != Blocks.STRUCTURE_BLOCK &&
this != Blocks.JIGSAW;
}
Expand Down Expand Up @@ -1740,7 +1740,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 28dbe30a98a6730839949bc9a6a90b78619ff84d..152de3c943b478be9ff2f0a4541bababef7a8723 100644
index f78744b6d6075f584d9a88612661854f3f04aed1..6cfecd797d3cd7f9ff84755eea6dea5888ecd4f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -200,7 +200,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0005-Update-version-fetcher-repo.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..917ffaae401f3374d07d7fb7c024234a
if (data == null) {
return null;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 46c038690a75a0bedcaf906b4c24b44add22d0fe..3926092cca4a27266bcbbc3bf54433f1a6e57ec3 100644
index 6cfecd797d3cd7f9ff84755eea6dea5888ecd4f9..683a278b271bae086bf5997bc6b86ce593744734 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -486,7 +486,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -482,7 +482,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
Expand Down
10 changes: 5 additions & 5 deletions patches/server/0006-Leaves-Server-Config-And-Command.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config And Command


diff --git a/build.gradle.kts b/build.gradle.kts
index cf8a410dedf26e48617ccad7e899edc26cf5f7c9..143f5bf36f550ccfa414dbbf9c00c9710798f66b 100644
index ff37a984cdbf20d7f0d7b75c7f60a5d2c1e2b894..9179c02fcbd71bd4ca5dadef96770afaf33220f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -216,6 +216,14 @@ tasks.registerRunTask("runDevServer") {
Expand Down Expand Up @@ -38,7 +38,7 @@ index a108ebfe472c908e86e0af2cfd9cb63083f58eb5..f97b2cb3ea855e6e250cabf357a050cd

this.setPvpAllowed(dedicatedserverproperties.pvp);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f6de1c6e8fd9086b7bd725f75ee2606583591d6a..a45a6fa9a2338626ba0d08061f327d41ac457f14 100644
index b7af2d4300facf41a025c8ca322bf6541949b3ab..2568bac002ee9835e1de6b2a2cbdbdbd6aea52da 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1098,6 +1098,7 @@ public final class CraftServer implements Server {
Expand All @@ -49,7 +49,7 @@ index f6de1c6e8fd9086b7bd725f75ee2606583591d6a..a45a6fa9a2338626ba0d08061f327d41
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -2990,6 +2991,14 @@ public final class CraftServer implements Server {
@@ -2987,6 +2988,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
Expand Down Expand Up @@ -85,7 +85,7 @@ index d97771ecaf06b92d92b5ca0224ae0866e36703a6..439305bb4f5ce232aa6237276c121d53
.withRequiredArg()
diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..10cf4d4aed544e0e0dd6698119734eb9e9cc92e2
index 0000000000000000000000000000000000000000..57bd1c9b79f7be0a63ca9a3f9d1360fa6df16463
--- /dev/null
+++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
@@ -0,0 +1,889 @@
Expand Down Expand Up @@ -973,7 +973,7 @@ index 0000000000000000000000000000000000000000..10cf4d4aed544e0e0dd6698119734eb9
+ @GlobalConfig(name = "vanilla-hopper", category = "fix")
+ public static boolean vanillaHopper = false;
+
+ @GlobalConfig(name = "spigot-EndPlatform-destroy", category = "fix")
+ @RemovedConfig(name = "spigot-EndPlatform-destroy", category = "fix")
+ public static boolean spigotEndPlatformDestroy = false;
+
+ // Leaves end - region
Expand Down
10 changes: 5 additions & 5 deletions patches/server/0007-Leaves-Protocol-Core.patch
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ index 0d362b80044f05e3c6cae9d0f3ab9af6349b5fed..7ce0fb36690e12f3f36c9a43e45ac718
((Runnable) this.tickables.get(i)).run();
}
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
index b43f87ff4b9853b5d4bbea5ff9686d64d9d0d26b..01c2e26f92d5d1e46b98ebd20727beb779c98095 100644
index 6998f32f8d79dbdb6b31ffaa126602fc4a428616..7bcadf3b793fd4c5d58e0e3e01a373b2e1a7a628 100644
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -149,6 +149,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -154,6 +154,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack

@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
Expand All @@ -75,7 +75,7 @@ index b43f87ff4b9853b5d4bbea5ff9686d64d9d0d26b..01c2e26f92d5d1e46b98ebd20727beb7
// Paper start - Brand support
if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) {
this.player.clientBrandName = brandPayload.brand();
@@ -166,6 +171,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -171,6 +176,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
for (String channel : channels.split("\0")) {
this.getCraftPlayer().addChannel(channel);
Expand All @@ -84,7 +84,7 @@ index b43f87ff4b9853b5d4bbea5ff9686d64d9d0d26b..01c2e26f92d5d1e46b98ebd20727beb7
} catch (Exception ex) {
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f9141e1997ef88ff5478d4a01b6bc719125631f2..8ccd40b562691e757c7b5efa1497d93a95040a9a 100644
index 9bb0dde8c3e6b3d17b3798a408658a8ffefd831f..e6a1942d44c589d6815824646b5517a5938385c3 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -349,6 +349,8 @@ public abstract class PlayerList {
Expand All @@ -105,7 +105,7 @@ index f9141e1997ef88ff5478d4a01b6bc719125631f2..8ccd40b562691e757c7b5efa1497d93a
ServerLevel worldserver = entityplayer.serverLevel();

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a02aafe76e1bd09e0f62a4b0bed648553ef92d47..7bd4373071204f13985e92bd64f6533cf43f39b5 100644
index 2568bac002ee9835e1de6b2a2cbdbdbd6aea52da..275704db5b984584504749437e8ecdc60d4aa871 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -476,6 +476,7 @@ public final class CraftServer implements Server {
Expand Down
Loading

0 comments on commit 615efda

Please sign in to comment.