Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch

@@ -1,14 +1,14 @@
-From 449f7d4c3da8968c7f41ad21397657d24fee2ae6 Mon Sep 17 00:00:00 2001
+From 89786f9d45d487551d3fce889b99928c86d5189e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b6eac78..260502b 100644
+index 024cf9c..3010245 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1024,6 +1024,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1046,6 +1046,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
@@ -17,5 +17,5 @@ index b6eac78..260502b 100644
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
          }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0