Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-23 00:31:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix a null pointer issue with multiworld

Browse Source
This commit is contained in:
Thinkofdeath 2015-03-07 12:11:01 +00:00
parent d8a9c7be42
commit 624c97f081
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms-patches/WorldServer.patch
View File

@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/WorldServer.java 2015-03-01 00:59:18.643214058 +0000 --- /home/matt/mc-dev-private//net/minecraft/server/WorldServer.java 2015-03-07 12:10:53.194679070 +0000
+++ src/main/java/net/minecraft/server/WorldServer.java 2015-03-01 00:59:18.647214058 +0000 +++ src/main/java/net/minecraft/server/WorldServer.java 2015-03-07 12:10:53.198679070 +0000
@@ -16,11 +16,23 @@ @@ -16,11 +16,23 @@
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -36,7 +36,7 @@
+ +
+ // Add env and gen to constructor + // Add env and gen to constructor
+ public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, WorldData worlddata, int i, MethodProfiler methodprofiler, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { + public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, WorldData worlddata, int i, MethodProfiler methodprofiler, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
+ super(idatamanager, worlddata, WorldProvider.byDimension(i), methodprofiler, false, gen, env); + super(idatamanager, worlddata, WorldProvider.byDimension(env.getId()), methodprofiler, false, gen, env);
+ this.dimension = i; + this.dimension = i;
+ this.pvpMode = minecraftserver.getPVP(); + this.pvpMode = minecraftserver.getPVP();
+ worlddata.world = this; + worlddata.world = this;