From b7886d14216149c58221698e17305a7f14665bb1 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Tue, 30 Oct 2012 17:09:18 -0400 Subject: Disable portal support for entities for now. Restore allowNether check. Relates to: BUKKIT-2695 BUKKIT-2675 --- src/main/java/net/minecraft/server/Entity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/net') diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index ddbb9c45..a99392ef 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -248,7 +248,7 @@ public abstract class Entity { i = this.z(); if (this.ao) { - // if (minecraftserver.getAllowNether()) { // CraftBukkit + if (minecraftserver.getAllowNether()) { if (this.vehicle == null && this.h++ >= i) { this.h = i; this.an = this.ab(); @@ -264,7 +264,7 @@ public abstract class Entity { } this.ao = false; - // } // CraftBukkit + } } else { if (this.h > 0) { this.h -= 4; @@ -1681,7 +1681,7 @@ public abstract class Entity { } public void b(int i) { - if (!this.world.isStatic && !this.dead) { + if (false && !this.world.isStatic && !this.dead) { // CraftBukkit - disable entity portal support for now. MinecraftServer minecraftserver = MinecraftServer.getServer(); int j = this.dimension; WorldServer worldserver = minecraftserver.getWorldServer(j); -- cgit v1.2.3