OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 09:42:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

(1.16.3) Missed some fixes to include in commit

Browse source
This commit is contained in:
Aikar 2020-09-10 19:56:58 -04:00
parent 64ed429884
commit 7d85344efd
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
23 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch
View file

@ -20,24 +20,10 @@ index f2938b115aa34158e76da9f974f5746ed43630e1..c83f7a0baee28c93b035a4bee68eb263
return (this.disabledSlots & 1 << enumitemslot.getSlotFlag()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index bf2749fd724ac7b67fc0d5887aa307745c5f1835..c0182f4c1478e6db9901bf0357ad08c3fd3699a9 100644
index bf2749fd724ac7b67fc0d5887aa307745c5f1835..c19f0b0dd3fe988a30049297355445fd73cae630 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -32,11 +32,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
}
@Override
+ @Deprecated // Paper
public ItemStack getItemInHand() {
return getEquipment().getItemInHand();
}
@Override
+ @Deprecated // Paper
public void setItemInHand(ItemStack item) {
getEquipment().setItemInHand(item);
}
@@ -238,5 +240,78 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -238,5 +238,78 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
public void setCanMove(boolean move) {
getHandle().canMove = move;
}
@ -91,7 +77,7 @@ index bf2749fd724ac7b67fc0d5887aa307745c5f1835..c0182f4c1478e6db9901bf0357ad08c3
+ for (org.bukkit.inventory.EquipmentSlot slot : slots) {
+ if (slot == org.bukkit.inventory.EquipmentSlot.OFF_HAND) continue;
+ net.minecraft.server.EnumItemSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
+ disabled += (1 << nmsSlot.c()) + (1 << (nmsSlot.c() + 8)) + (1 << (nmsSlot.c() + 16));
+ disabled += (1 << nmsSlot.getSlotFlag()) + (1 << (nmsSlot.getSlotFlag() + 8)) + (1 << (nmsSlot.getSlotFlag() + 16));
+ }
+ getHandle().disabledSlots = disabled;
+ }

4
Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch
View file

@ -149,10 +149,10 @@ index db84ddd62b627764ff5debc56095d37e81c94605..3a6e5cb459fb9866cf2e377b80350115
Map<EnumItemSlot, ItemStack> map = this.q();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index c0182f4c1478e6db9901bf0357ad08c3fd3699a9..47043374d2357a8fbc37e9ff1a55b3bf9aaeabcd 100644
index c19f0b0dd3fe988a30049297355445fd73cae630..cb22cbd68a4d310fecad3a87a97bf101216a5f64 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -313,5 +313,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -311,5 +311,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
public boolean isSlotDisabled(org.bukkit.inventory.EquipmentSlot slot) {
return getHandle().isSlotDisabled(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}

4
Spigot-Server-Patches/0366-incremental-chunk-saving.patch
View file

@ -265,7 +265,7 @@ index d8bedba819fa9ee0a4d3bdfbf0b010da7144dd68..c4ed4d58f7b344626acb13baeb142889
return PlayerChunk.getChunkState(playerchunk.getTicketLevel());
});
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 80a5905aeb5da0c2ce7a04d26f95433d7c598db3..a55d6f7f70e7002c55ec41da38183612a7f9a80b 100644
index 80a5905aeb5da0c2ce7a04d26f95433d7c598db3..e89b512613e77d1f11acc9dfa5fb5d69c824305f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -771,11 +771,43 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -297,7 +297,7 @@ index 80a5905aeb5da0c2ce7a04d26f95433d7c598db3..a55d6f7f70e7002c55ec41da38183612
+
+ worldDataServer.a(worldserver1.getWorldBorder().t());
+ worldDataServer.setCustomBossEvents(this.server.getBossBattleCustomData().save());
+ convertable.a(this.server.f, this.worldDataServer, this.server.getPlayerList().save());
+ convertable.a(this.server.customRegistry, this.worldDataServer, this.server.getPlayerList().save());
+ }
+ // CraftBukkit end
+ }

2
Spigot-Server-Patches/0367-Anti-Xray.patch
View file

@ -1411,7 +1411,7 @@ index a77c3895756e752e232f9a8abfc5851b1d4ef47f..79d3f19eb8acbed35a4eb11157d548d7
if (iblockdata1 == null) {
// CraftBukkit start - remove blockstate if failed (or the same)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a55d6f7f70e7002c55ec41da38183612a7f9a80b..ec1a41992b0fedd4562a495c9782cb7be1c4064f 100644
index e89b512613e77d1f11acc9dfa5fb5d69c824305f..f4a4902ed161c7fab5c625135f11ff2b6019981b 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -96,7 +96,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0370-Mark-entities-as-being-ticked-when-notifying-navigat.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Mark entities as being ticked when notifying navigation
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ec1a41992b0fedd4562a495c9782cb7be1c4064f..56068aa96855136264779cb26661d02d98849b28 100644
index f4a4902ed161c7fab5c625135f11ff2b6019981b..ef15df222d2e36b0850db15f66a59a66c4de05d7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1358,6 +1358,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0373-Asynchronous-chunk-IO-and-loading.patch
View file

@ -3910,7 +3910,7 @@ index d6aca683465c6898536507fab9e6888fef2e77e5..b926cebd053bef829517c9d9bbf1c609
HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 56068aa96855136264779cb26661d02d98849b28..f3c12fdf059d1cc1be61f6bd98364d4404effea9 100644
index ef15df222d2e36b0850db15f66a59a66c4de05d7..8663aa0450281d6e8130d0964d87e5c2c407e3d5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,79 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch
View file

@ -65,7 +65,7 @@ index 79d3f19eb8acbed35a4eb11157d548d79e6ea5a6..88c4faf64a577cc38fb0e80bee7ae7f2
if (chunk != null) {
chunk.a(oclass, axisalignedbb, list, predicate);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f3c12fdf059d1cc1be61f6bd98364d4404effea9..de468159b3fd3ea8498537a7755856d67cac5b7c 100644
index 8663aa0450281d6e8130d0964d87e5c2c407e3d5..86c8ce3f8c76250d401d16dbb3234f1fcfee2723 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -91,7 +91,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0375-Reduce-sync-loads.patch
View file

@ -329,7 +329,7 @@ index 88c4faf64a577cc38fb0e80bee7ae7f24cbe445f..8426bf5b16bbe7c9a8b1582e1dac0298
if (chunk != null) {
chunk.a(oclass, axisalignedbb, list, predicate);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index de468159b3fd3ea8498537a7755856d67cac5b7c..08e422310d94f325734994f31411ce22b35cc4b4 100644
index 86c8ce3f8c76250d401d16dbb3234f1fcfee2723..d45fb3b7303d4019a02a97baa5672e7a855af359 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -166,6 +166,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0399-Optimise-IEntityAccess-getPlayerByUUID.patch
View file

@ -23,7 +23,7 @@ index b6cf294e785b36b8bc800f26dbb8cfcb2119eae1..1cb8ba7cd28cdb8a660c2d78d35e86cd
EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 08e422310d94f325734994f31411ce22b35cc4b4..c417b5fae91ab681c44101c8ac233437a0a82343 100644
index d45fb3b7303d4019a02a97baa5672e7a855af359..476d241f85718ee878610c99a9ae5324aff67865 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -173,6 +173,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch
View file

@ -351,7 +351,7 @@ index 303d82bf4ba21b4a74805750650d07778b30d875..77c611a5366943031624b07e64d069f3
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c417b5fae91ab681c44101c8ac233437a0a82343..712c9f5708b4ddaccf961c99aeb57771c7039014 100644
index 476d241f85718ee878610c99a9ae5324aff67865..aae718d54361ea2b2bbd0bb39169b8a3ed3f7ad4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -743,17 +743,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch
View file

@ -267,7 +267,7 @@ index b95ff5ee16abeeef81690d9f47979bac603360d7..b3b2ae829b246764a18d22868d441579
public boolean isSavingDisabled() {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 712c9f5708b4ddaccf961c99aeb57771c7039014..0d958ef744f97951de8518703deb5d74ff63a221 100644
index aae718d54361ea2b2bbd0bb39169b8a3ed3f7ad4..0682984c234be5955b1414e9cbeab4ad525e7b05 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -557,7 +557,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0422-Optimise-TickListServer-by-rewriting-it.patch
View file

@ -1191,7 +1191,7 @@ index 3b8f56c0f0507ebdd9ac20be70688b4c0cfe4cf8..3e148b7e99554a1abe257dd3c9acafb9
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0d958ef744f97951de8518703deb5d74ff63a221..8708e033ad8b3b09e240d0410f884ba137dc211f 100644
index 0682984c234be5955b1414e9cbeab4ad525e7b05..85b1187cf71760f433ea0f8b972bcc9e43dbde2a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -182,6 +182,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0424-Ensure-Entity-is-never-double-registered.patch
View file

@ -23,7 +23,7 @@ index 28c3a8e5c09c3998e7e0d7ac9244dc8abcc6d69d..3467603fe784aad56acfb2879783aeb8
private boolean locked = false;
@Override
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8708e033ad8b3b09e240d0410f884ba137dc211f..0b4f5316425430f193f183d1006626da99138891 100644
index 85b1187cf71760f433ea0f8b972bcc9e43dbde2a..bd7c3c32809b79218d857f9ae6b4c23220d29ea5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -531,6 +531,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0425-Fix-unregistering-entities-from-unloading-chunks.patch
View file

@ -15,7 +15,7 @@ Combine that with a buggy detail of the previous implementation of
the Dupe UUID patch, then this was the likely source of the "Ghost entities"
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0b4f5316425430f193f183d1006626da99138891..1b91a7930e3299aabe10aaa2d3477b17849f22ff 100644
index bd7c3c32809b79218d857f9ae6b4c23220d29ea5..075f9d7b3dffc0285b2152d0e141adb685209f0c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1445,9 +1445,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0428-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
View file

@ -26,7 +26,7 @@ index 512940ef8608d28c83a4a8d0777a99ebf25b4e8b..f839091ae4385e763a19d680585a9363
EntityTypes<?> entitytypes = entity.getEntityType();
int i = entitytypes.getChunkRange() * 16;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 1b91a7930e3299aabe10aaa2d3477b17849f22ff..2ea5e2a95c4ce23e414e67860dbfa92e5f4a5568 100644
index 075f9d7b3dffc0285b2152d0e141adb685209f0c..d7959eab0f0f162b3d82697cc96014afb9e96dca 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1411,7 +1411,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0434-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
View file

@ -226,7 +226,7 @@ index 0675765b88a7312bad3bcf3160dd3f386d531d19..f152eb73c0bb5d6e24c6266503540662
// Spigot Start
CrashReport crashreport;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 2ea5e2a95c4ce23e414e67860dbfa92e5f4a5568..5841e77096f06ee38f115c6e2da91bac508c560e 100644
index d7959eab0f0f162b3d82697cc96014afb9e96dca..5a2a1c5059f768043856fedfc41bd76434b6b2bb 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -453,6 +453,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0440-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
View file

@ -6,7 +6,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done
This will help prevent many cases of unregistering entities during entity ticking
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5841e77096f06ee38f115c6e2da91bac508c560e..ad7c5aa671c3a1d6bc7615d93d64fe909b172d79 100644
index 5a2a1c5059f768043856fedfc41bd76434b6b2bb..8c718982e2759faa52968ca6c3f9fad9ec9ecc5e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -62,6 +62,16 @@ public class WorldServer extends World implements GeneratorAccessSeed {

6
Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch
View file

@ -337,7 +337,7 @@ index c702275e2c37d9d66b085221f933697d11cc6571..3d9c6ebe28f25270ac8a7a5ce26ea6e9
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0176b72d8a1b54e57a462272dac16d3416fa7cd8..5388a992eea0547d40a3f4fef95859473667dcd9 100644
index 0176b72d8a1b54e57a462272dac16d3416fa7cd8..b9e14473ed7e1e07f14246f06ef4070a90f03f3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -150,6 +150,37 @@ public class Main {
@ -378,7 +378,7 @@ index 0176b72d8a1b54e57a462272dac16d3416fa7cd8..5388a992eea0547d40a3f4fef9585947
try {
options = parser.parse(args);
} catch (joptsimple.OptionException ex) {
@@ -245,8 +276,63 @@ public class Main {
@@ -245,8 +276,65 @@ public class Main {
} catch (Throwable t) {
t.printStackTrace();
}
@ -403,6 +403,8 @@ index 0176b72d8a1b54e57a462272dac16d3416fa7cd8..5388a992eea0547d40a3f4fef9585947
+ tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport");
+ tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext");
+ tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$11");
+ tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$12");
+ tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$13");
+ tryPreloadClass("io.netty.channel.AbstractChannel$AbstractUnsafe$8");
+ tryPreloadClass("io.netty.util.concurrent.DefaultPromise");
+ tryPreloadClass("io.netty.util.concurrent.DefaultPromise$1");

2
Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
View file

@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
Set system properly at server startup if not set already to help protect from this.
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 5388a992eea0547d40a3f4fef95859473667dcd9..3ef864430bb56b3292709b78e948542a7ac6b882 100644
index b9e14473ed7e1e07f14246f06ef4070a90f03f3f..9118f054246ea09a4ca7b326604679d6c9addde4 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -20,6 +20,7 @@ public class Main {

2
Spigot-Server-Patches/0496-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
View file

@ -19,7 +19,7 @@ index 63b112b38a51873cf5769ad8506c3fdb9d52d42c..910d1b3788fa713cadf2c8a56f595282
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ad7c5aa671c3a1d6bc7615d93d64fe909b172d79..615b9189ce219a3c202f901465305cd1308de98a 100644
index 8c718982e2759faa52968ca6c3f9fad9ec9ecc5e..57b359710366607a5021edfef93b9e1f75aa3ea8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -303,8 +303,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0498-Optimize-Light-Engine.patch
View file

@ -1409,7 +1409,7 @@ index ebb9737995e0f738700d598af46a63f605f2b165..27e01bca675e46e814d18959702bb2ac
this.a.a(t0);
this.f();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 615b9189ce219a3c202f901465305cd1308de98a..73976aabba5e6b4628b51b431ddaeb8d35eaa76f 100644
index 57b359710366607a5021edfef93b9e1f75aa3ea8..4b8b0973c3d5765b276e8ae27062bc0d9d048120 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -710,6 +710,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0550-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect return for WorldServer#addAllEntitiesSafely
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 73976aabba5e6b4628b51b431ddaeb8d35eaa76f..afe6d44662e887216e1fadf3abba7257731ab8c0 100644
index 4b8b0973c3d5765b276e8ae27062bc0d9d048120..aa55c72afa6e10f6b50f42e4a6acc69ba340ac09 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1257,7 +1257,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0560-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index afe6d44662e887216e1fadf3abba7257731ab8c0..42877ba41d896671f66d7429b361eda351e1651a 100644
index aa55c72afa6e10f6b50f42e4a6acc69ba340ac09..25cdd7b0f71fcba1070a7ec4c8e3546c19073ad7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1862,12 +1862,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {