summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authort00thpick1 <t00thpick1dirko@gmail.com>2013-12-13 19:31:59 -0500
committerNate Mortensen <nate.richard.mortensen@gmail.com>2013-12-13 18:51:13 -0700
commitbdbd1808f73d97da39426465860efea7fc08c9e4 (patch)
tree075f4b36f99a05921ae973eb68765067b44a3cf0
parentfbe062caf5c29d153a27b5ab2d06a6e3a795ef15 (diff)
downloadcraftbukkit-bdbd1808f73d97da39426465860efea7fc08c9e4.tar
craftbukkit-bdbd1808f73d97da39426465860efea7fc08c9e4.tar.gz
craftbukkit-bdbd1808f73d97da39426465860efea7fc08c9e4.tar.lz
craftbukkit-bdbd1808f73d97da39426465860efea7fc08c9e4.tar.xz
craftbukkit-bdbd1808f73d97da39426465860efea7fc08c9e4.zip
Show fall particles while in creative mode. Fixes BUKKIT-5009
Relocate CraftBukkit patch to fall damage when changing gamemode from creative mode.
-rw-r--r--src/main/java/net/minecraft/server/PlayerConnection.java1
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c1483013..d32bf3f8 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -412,7 +412,6 @@ public class PlayerConnection implements PacketPlayInListener {
this.player.onGround = packetplayinflying.i();
this.minecraftServer.getPlayerList().d(this.player);
- if (this.player.playerInteractManager.isCreative()) return; // CraftBukkit - fixed fall distance accumulating while being in Creative mode.
this.player.b(this.player.locY - d0, packetplayinflying.i());
} else if (this.e % 20 == 0) {
this.a(this.y, this.z, this.q, this.player.yaw, this.player.pitch);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 01536089..48c5ae9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -628,6 +628,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
getHandle().playerInteractManager.setGameMode(EnumGamemode.a(mode.getValue()));
+ getHandle().fallDistance = 0;
getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, mode.getValue()));
}
}