diff --git a/nms-patches/ChatBaseComponent.patch b/nms-patches/ChatBaseComponent.patch
new file mode 100644
index 0000000000..f8b1572857
--- /dev/null
+++ b/nms-patches/ChatBaseComponent.patch
@@ -0,0 +1,11 @@
+--- ../work/decompile-8eb82bde//net/minecraft/server/ChatBaseComponent.java	2015-01-11 18:45:55.785438005 +0000
++++ src/main/java/net/minecraft/server/ChatBaseComponent.java	2015-01-11 18:45:55.785438005 +0000
+@@ -91,7 +91,7 @@
+     }
+ 
+     public int hashCode() {
+-        return 31 * this.b.hashCode() + this.a.hashCode();
++        return 31 * this.getChatModifier().hashCode() + this.a.hashCode(); // CraftBukkit - fix null pointer
+     }
+ 
+     public String toString() {