mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
dea9ce0a SPIGOT-7198: Add Sittable interface to Camel

CraftBukkit Changes:
eecb4c0dc SPIGOT-7196: Exception loading alternate worlds
0ff61e8fa SPIGOT-7198: Add Sittable interface to Camel
676441aac PR-1121: Handle additional missing SpawnEggs in MetaSpawnEgg
e85280e02 Handle missing SpawnEggs in MetaSpawnEgg

Spigot Changes:
d90018e0 SPIGOT-7199: NPE loading or creating world with custom chunk generator
This commit is contained in:
Nassim Jahnke 2022-12-08 11:53:14 +01:00
parent 66a288b4f4
commit dcc290167f
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
133 changed files with 199 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
View file

@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
Stack will identify any causer of this and warn instead of crashing.
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 543b42a6f527cb93611781867b5d7c2c63fc6b54..e8a52daa2ff7782fa39862e97580234058b8766e 100644
index a7a3e163cc93d71c843c75f93b78573fe8118613..fc561ba1a8df5fe87b69d7e2ff18ebca04933bfe 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1030,6 +1030,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@ -25,10 +25,10 @@ index 543b42a6f527cb93611781867b5d7c2c63fc6b54..e8a52daa2ff7782fa39862e975802340
EntityType<?> entitytypes = entity.getType();
int i = entitytypes.clientTrackingRange() * 16;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index a2bba2678a56c5ea197e8b18c4a96e0833121fbe..8646b9b07bc61ec1ee11b4053c67119c8ae20459 100644
index 52a514b657485246827bf9c153303b8b5229bf5b..62f1f568bba5fbcb68e49640adb79c9384619bc6 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2326,7 +2326,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2325,7 +2325,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void onTrackingStart(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@ -37,7 +37,7 @@ index a2bba2678a56c5ea197e8b18c4a96e0833121fbe..8646b9b07bc61ec1ee11b4053c67119c
if (entity instanceof ServerPlayer) {
ServerPlayer entityplayer = (ServerPlayer) entity;
@@ -2360,6 +2360,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2359,6 +2359,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
entity.valid = true; // CraftBukkit