diff options
author | mbax <matt@phozop.net> | 2013-07-08 19:43:37 -0400 |
---|---|---|
committer | mbax <matt@phozop.net> | 2013-07-08 19:43:37 -0400 |
commit | f6a0b1e4265544eaee4e4d4adb660812b01d6a06 (patch) | |
tree | 84b161b5b99aa45602889987e03b74ad4a9a8e08 /src/main/java/net/minecraft/server/WorldServer.java | |
parent | 2d9a9d8cea904deb7f748a0bbdd76a10012b3821 (diff) | |
download | craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.gz craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.lz craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.xz craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.zip |
Update CraftBukkit to 1.6.2
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/WorldServer.java | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index e787fb1b..eb9540fd 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -610,24 +610,10 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate entity.die(); } - if (!(entity.passenger instanceof EntityHuman)) { - super.entityJoinedWorld(entity, flag); - } + super.entityJoinedWorld(entity, flag); } // CraftBukkit end */ - public void vehicleEnteredWorld(Entity entity, boolean flag) { - try { - super.entityJoinedWorld(entity, flag); - } catch (Throwable throwable) { - CrashReport crashreport = CrashReport.a(throwable, "Forcefully ticking entity"); - CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being force ticked"); - - entity.a(crashreportsystemdetails); - throw new ReportedException(crashreport); - } - } - protected IChunkProvider j() { IChunkLoader ichunkloader = this.dataManager.createChunkLoader(this.worldProvider); @@ -799,7 +785,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate protected void a(Entity entity) { super.a(entity); this.entitiesById.a(entity.id, entity); - Entity[] aentity = entity.am(); + Entity[] aentity = entity.an(); if (aentity != null) { for (int i = 0; i < aentity.length; ++i) { @@ -811,7 +797,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate protected void b(Entity entity) { super.b(entity); this.entitiesById.d(entity.id); - Entity[] aentity = entity.am(); + Entity[] aentity = entity.an(); if (aentity != null) { for (int i = 0; i < aentity.length; ++i) { |