Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed random NPEs when generating a world

Browse Source
This commit is contained in:
Dinnerbone 2011-06-11 23:47:19 +01:00
parent 96b1b8a10c
commit b042f48b24
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraft/server/ChunkProviderServer.java
View File

@ -13,6 +13,7 @@ import java.util.Random;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.craftbukkit.CraftChunk; import org.bukkit.craftbukkit.CraftChunk;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.util.LongHashset; import org.bukkit.craftbukkit.util.LongHashset;
import org.bukkit.craftbukkit.util.LongHashtable; import org.bukkit.craftbukkit.util.LongHashtable;
import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkLoadEvent;
@ -182,8 +183,11 @@ public class ChunkProviderServer implements IChunkProvider {
long xRand = random.nextLong() / 2L * 2L + 1L; long xRand = random.nextLong() / 2L * 2L + 1L;
long zRand = random.nextLong() / 2L * 2L + 1L; long zRand = random.nextLong() / 2L * 2L + 1L;
random.setSeed((long) i * xRand + (long) j * zRand ^ world.getSeed()); random.setSeed((long) i * xRand + (long) j * zRand ^ world.getSeed());
for (BlockPopulator populator : world.getWorld().getPopulators()) { CraftWorld world = (CraftWorld)this.world.getWorld();
populator.populate(world.getWorld(), random, chunk.bukkitChunk); if (world != null) {
for (BlockPopulator populator : world.getPopulators()) {
populator.populate(world, random, chunk.bukkitChunk);
}
} }
BlockSand.a = false; BlockSand.a = false;
// CraftBukkit end // CraftBukkit end