summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-03-24 15:07:14 -0500
committerWarren Loo <evilseph@gmail.com>2012-03-25 18:23:51 -0400
commit94d718a1462168280c01ffd439707f7094794460 (patch)
treeefe268cac9eb73c8dadefe1f6743f8195ab88231 /src/main/java/net/minecraft
parent9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257 (diff)
downloadcraftbukkit-94d718a1462168280c01ffd439707f7094794460.tar
craftbukkit-94d718a1462168280c01ffd439707f7094794460.tar.gz
craftbukkit-94d718a1462168280c01ffd439707f7094794460.tar.lz
craftbukkit-94d718a1462168280c01ffd439707f7094794460.tar.xz
craftbukkit-94d718a1462168280c01ffd439707f7094794460.zip
Check abilities instead of mode for allow flight check. Fixes BUKKIT-1302
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index a87d7f74..65c11650 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -395,7 +395,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
AxisAlignedBB axisalignedbb = this.player.boundingBox.clone().grow((double) f4, (double) f4, (double) f4).a(0.0D, -0.55D, 0.0D);
- if (!this.minecraftServer.allowFlight && !this.player.itemInWorldManager.isCreative() && !worldserver.b(axisalignedbb)) {
+ if (!this.minecraftServer.allowFlight && !this.player.abilities.canFly && !worldserver.b(axisalignedbb)) { // CraftBukkit - check abilities instead of creative mode
if (d9 >= -0.03125D) {
++this.g;
if (this.g > 80) {