SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.17.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-07-07 00:00:00 +10:00
parent 0392f45e9c
commit e8c9836ec9
59 changed files with 428 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
View File

@@ -23,18 +23,15 @@
public class WorldServer extends World implements GeneratorAccessSeed {
public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0);
@@ -160,9 +176,9 @@
@@ -160,7 +176,7 @@
final List<EntityPlayer> players;
private final ChunkProviderServer chunkSource;
private final MinecraftServer server;
- public final IWorldDataServer serverLevelData;
+ public final WorldDataServer serverLevelData; // CraftBukkit - type
final EntityTickList entityTickList;
- private final PersistentEntitySectionManager<Entity> entityManager;
+ public final PersistentEntitySectionManager<Entity> entityManager;
public final PersistentEntitySectionManager<Entity> entityManager;
public boolean noSave;
private final SleepStatus sleepStatus;
private int emptyTime;
@@ -180,31 +196,52 @@
private final StructureManager structureFeatureManager;
private final boolean tickTime;
@@ -543,8 +540,8 @@
@Nullable
@Override
public WorldMap a(String s) {
- return (WorldMap) this.getMinecraftServer().F().getWorldPersistentData().a(WorldMap::b, s);
+ return (WorldMap) this.getMinecraftServer().F().getWorldPersistentData().a((nbttagcompound) -> {
- return (WorldMap) this.getMinecraftServer().E().getWorldPersistentData().a(WorldMap::b, s);
+ return (WorldMap) this.getMinecraftServer().E().getWorldPersistentData().a((nbttagcompound) -> {
+ // CraftBukkit start
+ // We only get here when the data file exists, but is not a valid map
+ WorldMap newMap = WorldMap.b(nbttagcompound);
@@ -559,7 +556,7 @@
@Override
public void a(String s, WorldMap worldmap) {
+ worldmap.id = s; // CraftBukkit
this.getMinecraftServer().F().getWorldPersistentData().a(s, (PersistentBase) worldmap);
this.getMinecraftServer().E().getWorldPersistentData().a(s, (PersistentBase) worldmap);
}
@@ -1432,6 +1655,11 @@