From bdbd1808f73d97da39426465860efea7fc08c9e4 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Fri, 13 Dec 2013 19:31:59 -0500 Subject: [PATCH] Show fall particles while in creative mode. Fixes BUKKIT-5009 Relocate CraftBukkit patch to fall damage when changing gamemode from creative mode. --- src/main/java/net/minecraft/server/PlayerConnection.java | 1 - src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index c1483013f6..d32bf3f89a 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 0153608931..48c5ae9c69 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())); } }