lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move getOwnerName/UUID to IBindable

Browse source 
Where it should have been to begin with... hehe...

Deprecated methods will be removed after beta
This commit is contained in:
Nick 2016-02-04 00:25:37 -08:00
parent 8c1eaddb97
commit fd16a58b6b
8 changed files with 72 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -205,9 +205,9 @@ public class EventHandler
if (held != null && held.getItem() instanceof IBindable)
{
held = NBTHelper.checkNBT(held);
if (Strings.isNullOrEmpty(BindableHelper.getOwnerUUID(held)))
IBindable bindable = (IBindable) held.getItem();
if (Strings.isNullOrEmpty(bindable.getOwnerUUID(held)))
{
IBindable bindable = (IBindable) held.getItem();
if (bindable.onBind(player, held))
{
String uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
@ -218,7 +218,7 @@ public class EventHandler
BindableHelper.setItemOwnerUUID(held, uuid);
BindableHelper.setItemOwnerName(held, player.getDisplayNameString());
}
} else if (BindableHelper.getOwnerUUID(held).equals(PlayerHelper.getUUIDFromPlayer(player).toString()) && !BindableHelper.getOwnerName(held).equals(player.getDisplayNameString()))
} else if (bindable.getOwnerUUID(held).equals(PlayerHelper.getUUIDFromPlayer(player).toString()) && !bindable.getOwnerName(held).equals(player.getDisplayNameString()))
BindableHelper.setItemOwnerName(held, player.getDisplayNameString());
}
}