diff options
| author | md_5 <git@md-5.net> | 2016-12-19 23:05:39 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-19 23:05:39 +1100 |
| commit | c8ff65136f23a3c2770b8d9ca508f61927f8acba (patch) | |
| tree | 3aec004e9a5fe6b7309d56031dca456a71f09b4a /nms-patches/SpawnerCreature.patch | |
| parent | 4602331b1dfe3699e054bcde8b8bd5670eb1046b (diff) | |
| download | craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar.gz craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar.lz craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar.xz craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.zip | |
SPIGOT-2936: Simplify WorldBorder diff
Diffstat (limited to 'nms-patches/SpawnerCreature.patch')
| -rw-r--r-- | nms-patches/SpawnerCreature.patch | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nms-patches/SpawnerCreature.patch b/nms-patches/SpawnerCreature.patch index 42f79568..377f8d79 100644 --- a/nms-patches/SpawnerCreature.patch +++ b/nms-patches/SpawnerCreature.patch @@ -18,22 +18,17 @@ public SpawnerCreature() {} -@@ -36,15 +42,18 @@ - for (int i1 = -8; i1 <= 8; ++i1) { - for (k = -8; k <= 8; ++k) { +@@ -38,13 +44,16 @@ boolean flag4 = i1 == -8 || i1 == 8 || k == -8 || k == 8; -- ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i1 + l, k + j); -+ // CraftBukkit start - use LongHash and LongHashSet -+ // ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i1 + l, k + j); + ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i1 + l, k + j); - if (!this.b.contains(chunkcoordintpair)) { -+ long chunkCoords = LongHash.toLong(i1 + l, k + j); ++ // CraftBukkit start - use LongHash and LongHashSet ++ long chunkCoords = LongHash.toLong(chunkcoordintpair.x, chunkcoordintpair.z); + if (!this.b.contains(chunkCoords)) { ++i; -- if (!flag4 && worldserver.getWorldBorder().isInBounds(chunkcoordintpair)) { -- PlayerChunk playerchunk = worldserver.getPlayerChunkMap().getChunk(chunkcoordintpair.x, chunkcoordintpair.z); -+ if (!flag4 && worldserver.getWorldBorder().isInBounds(i1 + l, k + j)) { // CraftBukkit -+ PlayerChunk playerchunk = worldserver.getPlayerChunkMap().getChunk(i1 + l, k + j); // CraftBukkit + if (!flag4 && worldserver.getWorldBorder().isInBounds(chunkcoordintpair)) { + PlayerChunk playerchunk = worldserver.getPlayerChunkMap().getChunk(chunkcoordintpair.x, chunkcoordintpair.z); if (playerchunk != null && playerchunk.e()) { - this.b.add(chunkcoordintpair); |