Get rid of ambiguity
By: md_5 <md_5@live.com.au>
This commit is contained in:
parent
20257562ed
commit
d96eda43f4
5 changed files with 25 additions and 26 deletions
|
@ -1,4 +1,4 @@
|
|||
From 9d73975f8eba9e17bc92818862e36e7645302a24 Mon Sep 17 00:00:00 2001
|
||||
From fe4457ac450fc12b1083ebbd067951921edb8290 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 3 Aug 2013 19:27:07 +1000
|
||||
Subject: [PATCH] Player Collision API
|
||||
|
@ -57,7 +57,7 @@ index f9ac1e1..9ff8c86 100644
|
|||
public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
|
||||
super(world, s);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 3231226..1e415db 100644
|
||||
index 9da9863..654c3c9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1122,6 +1122,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
@ -79,7 +79,7 @@ index 3231226..1e415db 100644
|
|||
+ }
|
||||
};
|
||||
|
||||
public Spigot spigot()
|
||||
public Player.Spigot spigot()
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue