diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/MobSpawnerAbstract.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/MobSpawnerAbstract.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java index 108b375b..67c3397d 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -98,7 +98,7 @@ public abstract class MobSpawnerAbstract { this.a(entity); this.a().triggerEffect(2004, this.b(), this.c(), this.d(), 0); if (entityinsentient != null) { - entityinsentient.q(); + entityinsentient.s(); } flag = true; @@ -120,9 +120,10 @@ public abstract class MobSpawnerAbstract { Iterator iterator = this.i().b.c().iterator(); while (iterator.hasNext()) { - NBTBase nbtbase = (NBTBase) iterator.next(); + String s = (String) iterator.next(); + NBTBase nbtbase = this.i().b.get(s); - nbttagcompound.set(nbtbase.getName(), nbtbase.clone()); + nbttagcompound.set(s, nbtbase.clone()); } entity.f(nbttagcompound); @@ -132,7 +133,7 @@ public abstract class MobSpawnerAbstract { NBTTagCompound nbttagcompound1; - for (Entity entity1 = entity; nbttagcompound.hasKey("Riding"); nbttagcompound = nbttagcompound1) { + for (Entity entity1 = entity; nbttagcompound.hasKeyOfType("Riding", 10); nbttagcompound = nbttagcompound1) { nbttagcompound1 = nbttagcompound.getCompound("Riding"); Entity entity2 = EntityTypes.createEntityByName(nbttagcompound1.getString("id"), entity.world); @@ -143,9 +144,10 @@ public abstract class MobSpawnerAbstract { Iterator iterator1 = nbttagcompound1.c().iterator(); while (iterator1.hasNext()) { - NBTBase nbtbase1 = (NBTBase) iterator1.next(); + String s1 = (String) iterator1.next(); + NBTBase nbtbase1 = nbttagcompound1.get(s1); - nbttagcompound2.set(nbtbase1.getName(), nbtbase1.clone()); + nbttagcompound2.set(s1, nbtbase1.clone()); } entity2.f(nbttagcompound2); @@ -186,35 +188,35 @@ public abstract class MobSpawnerAbstract { public void a(NBTTagCompound nbttagcompound) { this.mobName = nbttagcompound.getString("EntityId"); this.spawnDelay = nbttagcompound.getShort("Delay"); - if (nbttagcompound.hasKey("SpawnPotentials")) { + if (nbttagcompound.hasKeyOfType("SpawnPotentials", 9)) { this.mobs = new ArrayList(); - NBTTagList nbttaglist = nbttagcompound.getList("SpawnPotentials"); + NBTTagList nbttaglist = nbttagcompound.getList("SpawnPotentials", 10); for (int i = 0; i < nbttaglist.size(); ++i) { - this.mobs.add(new TileEntityMobSpawnerData(this, (NBTTagCompound) nbttaglist.get(i))); + this.mobs.add(new TileEntityMobSpawnerData(this, nbttaglist.get(i))); } } else { this.mobs = null; } - if (nbttagcompound.hasKey("SpawnData")) { + if (nbttagcompound.hasKeyOfType("SpawnData", 10)) { this.a(new TileEntityMobSpawnerData(this, nbttagcompound.getCompound("SpawnData"), this.mobName)); } else { this.a((TileEntityMobSpawnerData) null); } - if (nbttagcompound.hasKey("MinSpawnDelay")) { + if (nbttagcompound.hasKeyOfType("MinSpawnDelay", 99)) { this.minSpawnDelay = nbttagcompound.getShort("MinSpawnDelay"); this.maxSpawnDelay = nbttagcompound.getShort("MaxSpawnDelay"); this.spawnCount = nbttagcompound.getShort("SpawnCount"); } - if (nbttagcompound.hasKey("MaxNearbyEntities")) { + if (nbttagcompound.hasKeyOfType("MaxNearbyEntities", 99)) { this.maxNearbyEntities = nbttagcompound.getShort("MaxNearbyEntities"); this.requiredPlayerRange = nbttagcompound.getShort("RequiredPlayerRange"); } - if (nbttagcompound.hasKey("SpawnRange")) { + if (nbttagcompound.hasKeyOfType("SpawnRange", 99)) { this.spawnRange = nbttagcompound.getShort("SpawnRange"); } @@ -233,7 +235,7 @@ public abstract class MobSpawnerAbstract { nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange); nbttagcompound.setShort("SpawnRange", (short) this.spawnRange); if (this.i() != null) { - nbttagcompound.setCompound("SpawnData", (NBTTagCompound) this.i().b.clone()); + nbttagcompound.set("SpawnData", this.i().b.clone()); } if (this.i() != null || this.mobs != null && this.mobs.size() > 0) { |