Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable portal support for entities for now. Restore allowNether check.

Browse Source 
Relates to:
BUKKIT-2695 BUKKIT-2675
This commit is contained in:
EvilSeph 2012-10-30 17:09:18 -04:00
parent 6bf705dd08
commit b7886d1421
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/Entity.java
View File

@ -248,7 +248,7 @@ public abstract class Entity {
i = this.z(); i = this.z();
if (this.ao) { if (this.ao) {
// if (minecraftserver.getAllowNether()) { // CraftBukkit if (minecraftserver.getAllowNether()) {
if (this.vehicle == null && this.h++ >= i) { if (this.vehicle == null && this.h++ >= i) {
this.h = i; this.h = i;
this.an = this.ab(); this.an = this.ab();
@ -264,7 +264,7 @@ public abstract class Entity {
} }
this.ao = false; this.ao = false;
// } // CraftBukkit }
} else { } else {
if (this.h > 0) { if (this.h > 0) {
this.h -= 4; this.h -= 4;
@ -1681,7 +1681,7 @@ public abstract class Entity {
} }
public void b(int i) { 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(); MinecraftServer minecraftserver = MinecraftServer.getServer();
int j = this.dimension; int j = this.dimension;
WorldServer worldserver = minecraftserver.getWorldServer(j); WorldServer worldserver = minecraftserver.getWorldServer(j);