summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-10-30 17:09:18 -0400
committerEvilSeph <evilseph@gmail.com>2012-10-30 19:11:33 -0400
commitb7886d14216149c58221698e17305a7f14665bb1 (patch)
tree57e77713965344349532e5e54efc0e15bd5bf74b /src/main
parent6bf705dd0815885d0689d723be76bac5bdaf6a7e (diff)
downloadcraftbukkit-b7886d14216149c58221698e17305a7f14665bb1.tar
craftbukkit-b7886d14216149c58221698e17305a7f14665bb1.tar.gz
craftbukkit-b7886d14216149c58221698e17305a7f14665bb1.tar.lz
craftbukkit-b7886d14216149c58221698e17305a7f14665bb1.tar.xz
craftbukkit-b7886d14216149c58221698e17305a7f14665bb1.zip
Disable portal support for entities for now. Restore allowNether check.
Relates to: BUKKIT-2695 BUKKIT-2675
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/Entity.java6
1 files changed, 3 insertions, 3 deletions
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);