diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch
index b4e3b032d..081dc0d5a 100644
--- a/nms-patches/EntityPlayer.patch
+++ b/nms-patches/EntityPlayer.patch
@@ -715,9 +715,9 @@
      }
  
 +    // CraftBukkit start - Support multi-line messages
-+    public void sendMessage(IChatBaseComponent[] ichatbasecomponent) {
++    public void sendMessage(UUID uuid, IChatBaseComponent[] ichatbasecomponent) {
 +        for (IChatBaseComponent component : ichatbasecomponent) {
-+            this.sendMessage(component, SystemUtils.b);
++            this.sendMessage(component, (uuid == null) ? SystemUtils.b : uuid);
 +        }
 +    }
 +    // CraftBukkit end
diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index 9ee7c3fa1..b251d59f0 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -1003,11 +1003,11 @@
 +                        PlayerConnection.this.minecraftServer.console.sendMessage(message);
 +                        if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
 +                            for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
-+                                ((EntityPlayer) player).sendMessage(CraftChatMessage.fromString(message));
++                                ((EntityPlayer) player).sendMessage(PlayerConnection.this.player.getUniqueID(), CraftChatMessage.fromString(message));
 +                            }
 +                        } else {
 +                            for (Player player : queueEvent.getRecipients()) {
-+                                player.sendMessage(message);
++                                player.sendMessage(PlayerConnection.this.player.getUniqueID(), message);
 +                            }
 +                        }
 +                        return null;
@@ -1033,11 +1033,11 @@
 +                minecraftServer.console.sendMessage(s);
 +                if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
 +                    for (Object recipient : minecraftServer.getPlayerList().players) {
-+                        ((EntityPlayer) recipient).sendMessage(CraftChatMessage.fromString(s));
++                        ((EntityPlayer) recipient).sendMessage(PlayerConnection.this.player.getUniqueID(), CraftChatMessage.fromString(s));
 +                    }
 +                } else {
 +                    for (Player recipient : event.getRecipients()) {
-+                        recipient.sendMessage(s);
++                        recipient.sendMessage(PlayerConnection.this.player.getUniqueID(), s);
 +                    }
 +                }
 +            }