summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/SpawnerCreature.java
diff options
context:
space:
mode:
authorNate Mortensen <nate.richard.mortensen@gmail.com>2014-03-20 22:26:30 -0600
committerEvilSeph <evilseph@gmail.com>2014-03-21 23:56:34 -0400
commit385ace970ee7b7912419d601b8a0867c4c2794df (patch)
tree2549da069930b488940f8a99833c396ffc7e36d1 /src/main/java/net/minecraft/server/SpawnerCreature.java
parentafb3511a4a5a63007217f2dbbbbc753f3bee0aed (diff)
downloadcraftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.gz
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.lz
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.xz
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.zip
Update CraftBukkit to Minecraft 1.7.5
Diffstat (limited to 'src/main/java/net/minecraft/server/SpawnerCreature.java')
-rw-r--r--src/main/java/net/minecraft/server/SpawnerCreature.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index f514b789..2ef15d2a 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -22,7 +22,7 @@ public final class SpawnerCreature {
Chunk chunk = world.getChunkAt(i, j);
int k = i * 16 + world.random.nextInt(16);
int l = j * 16 + world.random.nextInt(16);
- int i1 = world.random.nextInt(chunk == null ? world.R() : chunk.h() + 16 - 1);
+ int i1 = world.random.nextInt(chunk == null ? world.S() : chunk.h() + 16 - 1);
return new ChunkPosition(k, i1, l);
}
@@ -47,7 +47,7 @@ public final class SpawnerCreature {
for (int i1 = -b0; i1 <= b0; ++i1) {
boolean flag3 = l == -b0 || l == b0 || i1 == -b0 || i1 == b0;
- // CraftBukkit start
+ // CraftBukkit start - use LongHash and LongObjectHashMap
long chunkCoords = LongHash.toLong(l + k, i1 + j);
if (!flag3) {
@@ -96,7 +96,7 @@ public final class SpawnerCreature {
label110:
while (iterator.hasNext()) {
- // CraftBukkit start
+ // CraftBukkit start = use LongHash and LongObjectHashMap
long key = ((Long) iterator.next()).longValue();
if (!this.a.get(key)) {
@@ -160,7 +160,7 @@ public final class SpawnerCreature {
groupdataentity = entityinsentient.a(groupdataentity);
worldserver.addEntity(entityinsentient, SpawnReason.NATURAL);
// CraftBukkit end
- if (j2 >= entityinsentient.bz()) {
+ if (j2 >= entityinsentient.bB()) {
continue label110;
}
}