diff options
Diffstat (limited to 'nms-patches/EntityPlayer.patch')
| -rw-r--r-- | nms-patches/EntityPlayer.patch | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index 77026b1a..a9a827c2 100644 --- a/nms-patches/EntityPlayer.patch +++ b/nms-patches/EntityPlayer.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/EntityPlayer.java 2014-12-12 19:26:14.249913563 +0000 -+++ src/main/java/net/minecraft/server/EntityPlayer.java 2014-12-12 19:25:07.997914283 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/EntityPlayer.java 2014-12-15 14:13:24.430966154 +0000 ++++ src/main/java/net/minecraft/server/EntityPlayer.java 2014-12-15 14:13:24.434966154 +0000 @@ -13,6 +13,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -446,7 +446,24 @@ public void b(IChatBaseComponent ichatbasecomponent) { this.playerConnection.sendPacket(new PacketPlayOutChat(ichatbasecomponent)); -@@ -768,6 +936,7 @@ +@@ -747,6 +915,8 @@ + } + + public void a(EnumGamemode enumgamemode) { ++ getBukkitEntity().setGameMode(org.bukkit.GameMode.getByValue(enumgamemode.getId())); ++ /* CraftBukkit start - defer to our setGameMode + this.playerInteractManager.setGameMode(enumgamemode); + this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, (float) enumgamemode.getId())); + if (enumgamemode == EnumGamemode.SPECTATOR) { +@@ -757,6 +927,7 @@ + + this.updateAbilities(); + this.bO(); ++ // CraftBukkit end */ + } + + public boolean v() { +@@ -768,6 +939,7 @@ } public boolean a(int i, String s) { @@ -454,7 +471,7 @@ if ("seed".equals(s) && !this.server.ad()) { return true; } else if (!"tell".equals(s) && !"help".equals(s) && !"me".equals(s) && !"trigger".equals(s)) { -@@ -781,6 +950,9 @@ +@@ -781,6 +953,9 @@ } else { return true; } @@ -464,7 +481,7 @@ } public String w() { -@@ -867,6 +1039,129 @@ +@@ -867,6 +1042,129 @@ } public IChatBaseComponent getPlayerListName() { |