diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-07 12:11:01 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-07 12:11:01 +0000 |
| commit | 624c97f0813bc4557bed58a22ea35e787bcfe563 (patch) | |
| tree | 8ff5a41ec1007cbbfea6371a8f1f5526aaac9fec /nms-patches/WorldServer.patch | |
| parent | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (diff) | |
| download | craftbukkit-624c97f0813bc4557bed58a22ea35e787bcfe563.tar craftbukkit-624c97f0813bc4557bed58a22ea35e787bcfe563.tar.gz craftbukkit-624c97f0813bc4557bed58a22ea35e787bcfe563.tar.lz craftbukkit-624c97f0813bc4557bed58a22ea35e787bcfe563.tar.xz craftbukkit-624c97f0813bc4557bed58a22ea35e787bcfe563.zip | |
Fix a null pointer issue with multiworld
Diffstat (limited to 'nms-patches/WorldServer.patch')
| -rw-r--r-- | nms-patches/WorldServer.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/WorldServer.patch b/nms-patches/WorldServer.patch index b435c1d5..22f986b9 100644 --- a/nms-patches/WorldServer.patch +++ b/nms-patches/WorldServer.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/WorldServer.java 2015-03-01 00:59:18.643214058 +0000 -+++ src/main/java/net/minecraft/server/WorldServer.java 2015-03-01 00:59:18.647214058 +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-07 12:10:53.198679070 +0000 @@ -16,11 +16,23 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,7 +36,7 @@ + + // 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) { -+ 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.pvpMode = minecraftserver.getPVP(); + worlddata.world = this; |