diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-27 19:29:22 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-27 19:29:22 +0000 |
| commit | bd703b831ce480c36236c6a30d4af08b7e33a065 (patch) | |
| tree | 20b67a25c1a2792bdea7230c8c6285bdafa27d21 | |
| parent | c80683161952dcd465a9e9514daf488c1177b944 (diff) | |
| download | craftbukkit-bd703b831ce480c36236c6a30d4af08b7e33a065.tar craftbukkit-bd703b831ce480c36236c6a30d4af08b7e33a065.tar.gz craftbukkit-bd703b831ce480c36236c6a30d4af08b7e33a065.tar.lz craftbukkit-bd703b831ce480c36236c6a30d4af08b7e33a065.tar.xz craftbukkit-bd703b831ce480c36236c6a30d4af08b7e33a065.zip | |
SPIGOT-303: Fix NPE in ChatModifier
| -rw-r--r-- | nms-patches/ChatModifier.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/nms-patches/ChatModifier.patch b/nms-patches/ChatModifier.patch new file mode 100644 index 00000000..b28629d2 --- /dev/null +++ b/nms-patches/ChatModifier.patch @@ -0,0 +1,30 @@ +--- ../work/decompile-8eb82bde//net/minecraft/server/ChatModifier.java 2014-12-27 19:28:58.855157429 +0000 ++++ src/main/java/net/minecraft/server/ChatModifier.java 2014-12-27 19:28:58.855157429 +0000 +@@ -160,16 +160,18 @@ + } + + public int hashCode() { +- int i = this.b.hashCode(); ++ // CraftBukkit start - fix npe ++ int i = b == null ? 0 : this.b.hashCode(); + +- i = 31 * i + this.c.hashCode(); +- i = 31 * i + this.d.hashCode(); +- i = 31 * i + this.e.hashCode(); +- i = 31 * i + this.f.hashCode(); +- i = 31 * i + this.g.hashCode(); +- i = 31 * i + this.h.hashCode(); +- i = 31 * i + this.i.hashCode(); +- i = 31 * i + this.j.hashCode(); ++ i = 31 * i + (c == null ? 0 : this.c.hashCode()); ++ i = 31 * i + (d == null ? 0 : this.d.hashCode()); ++ i = 31 * i + (e == null ? 0 : this.e.hashCode()); ++ i = 31 * i + (f == null ? 0 : this.f.hashCode()); ++ i = 31 * i + (g == null ? 0 : this.g.hashCode()); ++ i = 31 * i + (h == null ? 0 : this.h.hashCode()); ++ i = 31 * i + (this.i == null ? 0 : this.i.hashCode()); ++ i = 31 * i + (j == null ? 0 : this.j.hashCode()); ++ // CraftBukkit end + return i; + } + |