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

Merge pull request #262 from hilburn/master

Browse source 
Fixes API
This commit is contained in:
WayofTime 2015-02-25 06:11:42 -05:00
parent 4eb22891ad c8d6e6d5ae
commit 2f47ffa955
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java
View file

@ -379,7 +379,12 @@ public class SoulNetworkHandler
} }
} }
public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) public static void checkAndSetItemOwner(ItemStack item, EntityPlayer player)
{
checkAndSetItemPlayer(item, player);
}
public static boolean checkAndSetItemPlayer(ItemStack item, EntityPlayer player)
{ {
if (item.hasTagCompound() && !item.getTagCompound().getString("ownerName").equals("")) return true; if (item.hasTagCompound() && !item.getTagCompound().getString("ownerName").equals("")) return true;

2
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java
View file

@ -85,7 +85,7 @@ public class BlockTeleposer extends BlockContainer
{ {
if (playerItem.getItem() instanceof TelepositionFocus) if (playerItem.getItem() instanceof TelepositionFocus)
{ {
SoulNetworkHandler.checkAndSetItemOwner(playerItem, player); SoulNetworkHandler.checkAndSetItemPlayer(playerItem, player);
if (playerItem.getTagCompound() == null) if (playerItem.getTagCompound() == null)
{ {

2
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
View file

@ -187,7 +187,7 @@ public class EnergyItems extends Item implements IBindable
public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player)
{ {
if (SpellHelper.isFakePlayer(player)) return false; if (SpellHelper.isFakePlayer(player)) return false;
return SoulNetworkHandler.checkAndSetItemOwner(item, player); return SoulNetworkHandler.checkAndSetItemPlayer(item, player);
} }
public static void setItemOwner(ItemStack item, String ownerName) public static void setItemOwner(ItemStack item, String ownerName)