Fix merge conflict from upstream change

Bukkit-Patches/0006-BungeeCord-Support.patch

@@ -1,17 +1,25 @@
-From 4daa807ee8f6273b14ea131d37fc28d129db1973 Mon Sep 17 00:00:00 2001
+From b5740ad8b2744ba6b929533836aead5cc5e1c061 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index de42f2e..0c46c84 100644
+index 5c5d526..724f601 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -646,4 +646,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -647,7 +647,6 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *     yet or has logged out
       */
      public void setScoreboard(Scoreboard scoreboard) throws IllegalArgumentException, IllegalStateException;
+-
+     /**
+      * Gets if the client is displayed a 'scaled' health, that is, health on a
+      * scale from 0-20.
+@@ -667,4 +666,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+      * @param scale if the client health display is scaled
+      */
+     public void setScaleHealth(boolean scale);
 +
 +    // Spigot start
 +    public class Spigot
@@ -99,5 +107,4 @@ index 60c0875..dab3c5c 100644
       * Gets the current result of the login, as an enum
       *
 -- 
-1.8.1.2
+1.8.1.msysgit.1
-