summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityTracker.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-19 22:03:52 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-20 10:43:00 -0600
commit23b67643741d5754af4de020a29d557078f9f81d (patch)
tree90e1a32f7eb94af49a381cb6bc34bf6247f0efe6 /src/main/java/net/minecraft/server/EntityTracker.java
parent9f1bf124eec7c20f16b2034fd9fba55f70c805fd (diff)
downloadcraftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.gz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.lz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.xz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.zip
Update CraftBukkit to Minecraft 1.4.6
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTracker.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityTracker.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index f0ae58f5..d2d6ff0d 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -14,7 +14,7 @@ public class EntityTracker {
public EntityTracker(WorldServer worldserver) {
this.world = worldserver;
- this.d = worldserver.getMinecraftServer().getServerConfigurationManager().a();
+ this.d = worldserver.getMinecraftServer().getPlayerList().a();
}
// CraftBukkit - synchronized
@@ -51,6 +51,8 @@ public class EntityTracker {
this.addEntity(entity, 64, 10, true);
} else if (entity instanceof EntityThrownExpBottle) {
this.addEntity(entity, 64, 10, true);
+ } else if (entity instanceof EntityFireworks) {
+ this.addEntity(entity, 64, 10, true);
} else if (entity instanceof EntityItem) {
this.addEntity(entity, 64, 20, true);
} else if (entity instanceof EntityMinecart) {