Get rid of ambiguity

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0029-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 55ea05602e8a83d38f8bf38c05a76fbb42c8fac6 Mon Sep 17 00:00:00 2001
+From 7977f412b0d04e21881acf1d1fcae03631cdbe69 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -59,12 +59,12 @@ index f87ebf9..f5032be 100644
                      event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6e9834f..29fcdfb 100644
+index 988c6e7..aa49c6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1077,6 +1077,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
-     private final Spigot spigot = new Spigot()
+     private final Player.Spigot spigot = new Player.Spigot()
      {
 +        @Override
 +        public InetSocketAddress getRawAddress()
@@ -73,7 +73,7 @@ index 6e9834f..29fcdfb 100644
 +        }
      };
  
-     public Spigot spigot()
+     public Player.Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 index e5a09b3..a598954 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java