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

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
paper-server/nms-patches/SecondaryWorldServer.patch
View File

@@ -1,37 +1,21 @@
--- a/net/minecraft/server/SecondaryWorldServer.java
+++ b/net/minecraft/server/SecondaryWorldServer.java
@@ -2,8 +2,11 @@
@@ -4,11 +4,13 @@
public class SecondaryWorldServer extends WorldServer {
- public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, DimensionManager dimensionmanager, WorldServer worldserver, MethodProfiler methodprofiler) {
- super(minecraftserver, idatamanager, worldserver.h(), new SecondaryWorldData(worldserver.getWorldData()), dimensionmanager, methodprofiler);
- public SecondaryWorldServer(WorldServer worldserver, MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener) {
- super(minecraftserver, executor, worldnbtstorage, new SecondaryWorldData(worldserver.getWorldData()), dimensionmanager, gameprofilerfiller, worldloadlistener);
- worldserver.getWorldBorder().a((IWorldBorderListener) (new IWorldBorderListener.a(this.getWorldBorder())));
+ // CraftBukkit start - Add WorldData, Environment and ChunkGenerator arguments
+ public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, DimensionManager dimensionmanager, WorldServer worldserver, MethodProfiler methodprofiler, WorldData worldData, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
+ super(minecraftserver, idatamanager, worldserver.h(), worldData, dimensionmanager, methodprofiler, env, gen);
+ public SecondaryWorldServer(WorldServer worldserver, MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, WorldData worldData, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
+ super(minecraftserver, executor, worldnbtstorage, worldData, dimensionmanager, gameprofilerfiller, worldloadlistener, env, gen);
+ // worldserver.getWorldBorder().a((IWorldBorderListener) (new IWorldBorderListener.a(this.getWorldBorder())));
+ // CraftBukkit end
+ /* CraftBukkit start
worldserver.getWorldBorder().a(new IWorldBorderListener() {
public void a(WorldBorder worldborder, double d0) {
SecondaryWorldServer.this.getWorldBorder().setSize(d0);
@@ -33,9 +36,10 @@
SecondaryWorldServer.this.getWorldBorder().setDamageBuffer(d0);
}
});
+ // CraftBukkit end */
}
- @Override
- protected void a() {}
+ // @Override // CraftBukkit
+ // protected void a() {} // CraftBukkit
public SecondaryWorldServer i_() {
String s = PersistentVillage.a(this.worldProvider);
@@ -49,7 +53,7 @@
this.villages.a((World) this);
}
- return this;
+ return (SecondaryWorldServer) super.i_(); // CraftBukkit
}
public void t_() {
}