summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-08-05 14:47:11 -0400
committerEvilSeph <evilseph@gmail.com>2011-08-05 15:52:39 -0400
commita7f2798862620dc7886dbe91a59755e2cee3d937 (patch)
tree8d4c6d1cde2f7b1d4078180455b4c91ec5fb45fa /src/main/java
parent4117d6b65e22adbb0221113b089d6d6528fa33f2 (diff)
downloadcraftbukkit-a7f2798862620dc7886dbe91a59755e2cee3d937.tar
craftbukkit-a7f2798862620dc7886dbe91a59755e2cee3d937.tar.gz
craftbukkit-a7f2798862620dc7886dbe91a59755e2cee3d937.tar.lz
craftbukkit-a7f2798862620dc7886dbe91a59755e2cee3d937.tar.xz
craftbukkit-a7f2798862620dc7886dbe91a59755e2cee3d937.zip
Made PlayerPortal event fire regardless of allow-nether setting.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6481e0d0..c7fa3a18 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -229,7 +229,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
if (this.E) {
- if (this.b.propertyManager.getBoolean("allow-nether", true)) {
+ //if (this.b.propertyManager.getBoolean("allow-nether", true)) { // CraftBukkit
if (this.activeContainer != this.defaultContainer) {
this.y();
}
@@ -246,7 +246,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
this.E = false;
- }
+ //} // CraftBukkit
} else {
if (this.F > 0.0F) {
this.F -= 0.05F;