Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 22:44:17 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
EvilSeph 2012-02-10 00:43:12 -05:00
parent 56741552e5
commit 0170ae9523
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minecraft/server/EntityLiving.java
View File

@ -216,9 +216,11 @@ public abstract class EntityLiving extends Entity {
this.extinguish(); this.extinguish();
} else { } else {
if (this.getAirTicks() != 300) { // CraftBukkit - only set if needed to work around a datawatcher inefficiency // CraftBukkit start - only set if needed to work around a datawatcher inefficiency
if (this.getAirTicks() != 300) {
this.setAirTicks(maxAirTicks); this.setAirTicks(maxAirTicks);
} }
// CraftBukkit end
} }
this.ax = this.ay; this.ax = this.ay;

14
src/main/java/net/minecraft/server/SpawnerCreature.java
View File

@ -6,16 +6,17 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
// CraftBukkit // CraftBukkit start
import java.util.ArrayList; import java.util.ArrayList;
import org.bukkit.craftbukkit.util.LongBaseHashtable; import org.bukkit.craftbukkit.util.LongBaseHashtable;
import org.bukkit.craftbukkit.util.EntryBase; import org.bukkit.craftbukkit.util.EntryBase;
import org.bukkit.craftbukkit.util.LongHash; import org.bukkit.craftbukkit.util.LongHash;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
// CraftBukkit end
public final class SpawnerCreature { public final class SpawnerCreature {
// CraftBukkit start
// private static HashMap b = new HashMap(); // CraftBukkit - moved local to spawnEntities // private static HashMap b = new HashMap(); // Moved local to spawnEntities
static private class ChunkEntry extends EntryBase { static private class ChunkEntry extends EntryBase {
public boolean spawn; public boolean spawn;
@ -32,6 +33,7 @@ public final class SpawnerCreature {
return LongHash.lsw(key); return LongHash.lsw(key);
} }
} }
// CraftBukkit end
protected static final Class[] a = new Class[] { EntitySpider.class, EntityZombie.class, EntitySkeleton.class}; protected static final Class[] a = new Class[] { EntitySpider.class, EntityZombie.class, EntitySkeleton.class};
@ -49,8 +51,10 @@ public final class SpawnerCreature {
if (!flag && !flag1) { if (!flag && !flag1) {
return 0; return 0;
} else { } else {
// b.clear(); // CraftBukkit // CraftBukkit start
LongBaseHashtable chunkCoords = new LongBaseHashtable(); // CraftBukkit // b.clear();
LongBaseHashtable chunkCoords = new LongBaseHashtable();
// CraftBukkit end
int i; int i;
int j; int j;