diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-12 19:27:37 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-12 19:27:37 +0000 |
| commit | 64157d1de5c34fb3b64297348d7b0e17c5aec4ab (patch) | |
| tree | 55e7dd4687081fdf94bbf462b21a9728babbac80 /nms-patches/EntityPlayer.patch | |
| parent | 54888dfafbe296594d421301fc80227effc1a83d (diff) | |
| download | craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar.gz craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar.lz craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar.xz craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.zip | |
SPIGOT-189: Remove ListenerWrapper in favour of just doing it in EntityPlayer
Diffstat (limited to 'nms-patches/EntityPlayer.patch')
| -rw-r--r-- | nms-patches/EntityPlayer.patch | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index 7cc11699..77026b1a 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-10 17:04:38.336551163 +0000 -+++ src/main/java/net/minecraft/server/EntityPlayer.java 2014-12-10 17:04:12.096551448 +0000 +--- ../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 @@ -13,6 +13,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -446,7 +446,25 @@ public void b(IChatBaseComponent ichatbasecomponent) { this.playerConnection.sendPacket(new PacketPlayOutChat(ichatbasecomponent)); -@@ -867,6 +1035,129 @@ +@@ -768,6 +936,7 @@ + } + + public boolean a(int i, String s) { ++ /* CraftBukkit start + 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 @@ + } else { + return true; + } ++ */ ++ return true; ++ // CraftBukkit end + } + + public String w() { +@@ -867,6 +1039,129 @@ } public IChatBaseComponent getPlayerListName() { |