Get rid of ambiguity

This commit is contained in:
md_5 2013-08-03 19:59:46 +10:00
parent edd0d42995
commit 7db0f5eda8
5 changed files with 25 additions and 26 deletions

View file

@ -1,4 +1,4 @@
From 44b8f77d9f563c6ed5482428d75865c97a657613 Mon Sep 17 00:00:00 2001
From 880a779913939ebd2e21755be3251bf62e40ae7a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -24,19 +24,20 @@ index 75b1fb2..8881878 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index b46b9c4..c91b12c 100644
index b46b9c4..a386001 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -40,4 +40,14 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
@@ -40,4 +40,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
public EntityType getType() {
return EntityType.ARROW;
}
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ private final Arrow.Spigot spigot = new Arrow.Spigot()
+ {
+ };
+ public Spigot spigot()
+
+ public Arrow.Spigot spigot()
+ {
+ return spigot;
+ }
@ -63,7 +64,7 @@ index 8e2e5cd..b1f86a0 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d5d43c9..3e42b91 100644
index d5d43c9..3cf0c28 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1072,4 +1072,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -72,11 +73,11 @@ index d5d43c9..3e42b91 100644
}
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ private final Player.Spigot spigot = new Player.Spigot()
+ {
+ };
+
+ public Spigot spigot()
+ public Player.Spigot spigot()
+ {
+ return spigot;
+ }