diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/event/ItemBindEvent.java b/src/main/java/WayofTime/alchemicalWizardry/api/event/ItemBindEvent.java
index a0a92732..95e15da4 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/api/event/ItemBindEvent.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/api/event/ItemBindEvent.java
@@ -1,9 +1,11 @@
package WayofTime.alchemicalWizardry.api.event;
+import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.eventhandler.Event;
+@Cancelable
public class ItemBindEvent extends Event
{
public final EntityPlayer player;
diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java
index 74cbc72d..883c5214 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java
@@ -379,22 +379,22 @@ public class SoulNetworkHandler
}
}
- public static void checkAndSetItemOwner(ItemStack item, EntityPlayer player)
+ public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player)
{
- if (item.getTagCompound() == null)
- {
- item.setTagCompound(new NBTTagCompound());
- }
+ if (item.hasTagCompound() && !item.getTagCompound().getString("ownerName").equals("")) return true;
- if (item.getTagCompound().getString("ownerName").equals(""))
+ ItemBindEvent event = new ItemBindEvent(player, SoulNetworkHandler.getUsername(player), item);
+
+ if(!MinecraftForge.EVENT_BUS.post(event))
{
- ItemBindEvent event = new ItemBindEvent(player, SoulNetworkHandler.getUsername(player), item);
-
- if(!MinecraftForge.EVENT_BUS.post(event))
- {
- item.getTagCompound().setString("ownerName", event.key);
- }
+ if (!item.hasTagCompound())
+ {
+ item.setTagCompound(new NBTTagCompound());
+ }
+ item.getTagCompound().setString("ownerName", event.key);
+ return true;
}
+ return false;
}
public static void checkAndSetItemOwner(ItemStack item, String ownerName)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java
index 0d12a717..f2138aa2 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java
@@ -93,9 +93,7 @@ public class ArmourInhibitor extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java
index 81d77e15..885b7d07 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java
@@ -53,9 +53,7 @@ public class BlankSpell extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
index 6dd30ccc..746a1660 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
@@ -106,9 +106,7 @@ public class BoundAxe extends ItemAxe implements IBindable
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
index 89a76fb7..f05493ef 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
@@ -108,9 +108,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
index 315cdb0d..e08994ba 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
@@ -112,9 +112,7 @@ public class BoundShovel extends ItemSpade implements IBindable
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java
index 003aed13..10a57088 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java
@@ -51,10 +51,9 @@ public class CheatyItem extends Item implements IBindable
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
World world = par3EntityPlayer.worldObj;
- if (par3EntityPlayer instanceof FakePlayer)
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer)
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java
index c4eda989..217adc20 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java
@@ -55,7 +55,11 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
+ {
+ return par1ItemStack;
+ }
+
World world = par3EntityPlayer.worldObj;
if (world != null)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
index 88e3771f..af78474e 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
@@ -65,9 +65,7 @@ public class EnergyBazooka extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java
index e0b2f76d..38021266 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java
@@ -65,9 +65,7 @@ public class EnergyBlast extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
index 2035261d..afe2cf36 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
@@ -184,9 +184,10 @@ public class EnergyItems extends Item implements IBindable
}
//Global static methods
- public static void checkAndSetItemOwner(ItemStack item, EntityPlayer player)
+ public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player)
{
- SoulNetworkHandler.checkAndSetItemOwner(item, player);
+ if (SpellHelper.isFakePlayer(player)) return false;
+ return SoulNetworkHandler.checkAndSetItemOwner(item, player);
}
public static void setItemOwner(ItemStack item, String ownerName)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java
index 523a5e7d..dd69f232 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java
@@ -87,9 +87,7 @@ public class EnergySword extends ItemSword
{
if (par3EntityLivingBase instanceof EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase);
-
- if (!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed()))
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed()))
{
return false;
}
@@ -102,9 +100,7 @@ public class EnergySword extends ItemSword
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java
index d9d4be7c..3798a1c7 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java
@@ -53,9 +53,7 @@ public class ItemComplexSpellCrystal extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java
index 7df9c844..5db9c349 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java
@@ -51,10 +51,8 @@ public class ItemDiabloKey extends EnergyItems
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
World world = par3EntityPlayer.worldObj;
-
- if (par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP)
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP)
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java
index e08723bf..fc4a64db 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java
@@ -259,9 +259,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
int maxRitualID = Rituals.getNumberOfRituals();
String currentRitualID = this.getCurrentRitual(par1ItemStack);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java
index 3a139c27..b507deec 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java
@@ -54,8 +54,10 @@ public class LavaCrystal extends EnergyItems
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
- int damage = this.getDamage(par1ItemStack);
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
+ {
+ int damage = this.getDamage(par1ItemStack);
+ }
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java
index 80ce0898..7714e676 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java
@@ -36,13 +36,13 @@ public class ScribeTool extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par1ItemStack.getItemDamage() > 0)
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{
- par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
+ if (par1ItemStack.getItemDamage() > 0)
+ {
+ par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
+ }
}
-
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java
index 7a1aee95..11fdbdf9 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java
@@ -54,11 +54,12 @@ public class TelepositionFocus extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{
- return par1ItemStack;
+ if (par3EntityPlayer.isSneaking())
+ {
+ return par1ItemStack;
+ }
}
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java
index 4ccfebdc..c7ad045e 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java
@@ -44,14 +44,14 @@ public class ItemBloodFrame extends EnergyItems //implements IHiveFrame
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par1ItemStack.getItemDamage() > 0)
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{
- EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed());
- par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
+ if (par1ItemStack.getItemDamage() > 0)
+ {
+ EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed());
+ par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
+ }
}
-
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java
index 1716337f..466082a0 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java
@@ -49,9 +49,7 @@ public class AirSigil extends EnergyItems implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
index b2b9abbd..e19ecbd1 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
@@ -59,7 +59,7 @@ public class DivinationSigil extends Item implements ArmourUpgrade, IReagentMani
{
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
- if (par3EntityPlayer.worldObj.isRemote)
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
index cc29cf18..1d672af8 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
@@ -49,8 +49,7 @@ public class ItemBloodLightSigil extends EnergyItems implements IHolding
@Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
- if(!EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()))
+ if(!EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()))
{
return true;
}
@@ -96,9 +95,7 @@ public class ItemBloodLightSigil extends EnergyItems implements IHolding
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemHarvestSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemHarvestSigil.java
index 2c5d0545..bd969f74 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemHarvestSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemHarvestSigil.java
@@ -96,9 +96,7 @@ public class ItemHarvestSigil extends EnergyItems implements IHolding, ArmourUpg
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemPackRatSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemPackRatSigil.java
index 0129ef1b..91ee478c 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemPackRatSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemPackRatSigil.java
@@ -97,9 +97,7 @@ public class ItemPackRatSigil extends EnergyItems implements IHolding, ArmourUpg
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSeerSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSeerSigil.java
index 48af42dd..49ab550f 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSeerSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSeerSigil.java
@@ -46,9 +46,7 @@ public class ItemSeerSigil extends Item implements IHolding, ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.worldObj.isRemote)
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfEnderSeverance.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfEnderSeverance.java
index f350757e..bab023ff 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfEnderSeverance.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfEnderSeverance.java
@@ -97,9 +97,7 @@ public class ItemSigilOfEnderSeverance extends EnergyItems implements IHolding
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfSupression.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfSupression.java
index 9341389b..9ac24cf9 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfSupression.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfSupression.java
@@ -100,9 +100,7 @@ public class ItemSigilOfSupression extends EnergyItems implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfTheAssassin.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfTheAssassin.java
index 9e285c42..06b25cf6 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfTheAssassin.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfTheAssassin.java
@@ -78,9 +78,7 @@ public class ItemSigilOfTheAssassin extends EnergyItems implements ArmourUpgrade
*/
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java
index 549add1c..1ce01362 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java
@@ -75,9 +75,7 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
*/
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
index 8fd116b8..9118ce7f 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
@@ -96,9 +96,7 @@ public class SigilOfElementalAffinity extends EnergyItems
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
index 11e6b690..8413fe0e 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
@@ -101,35 +101,33 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
@Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
-
- if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer))
{
- EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
-
- if (par3World.isRemote)
+ if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
{
- par3World.playAuxSFX(2005, par4, par5, par6, 0);
+ EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
+
+ if (par3World.isRemote)
+ {
+ par3World.playAuxSFX(2005, par4, par5, par6, 0);
+ return true;
+ }
+
return true;
}
-
- return true;
}
-
return false;
}
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par2World.isRemote)
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
- if (par3EntityPlayer.isSneaking())
+ if (par2World.isRemote)
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
index 69e9a2ff..6fc233d2 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
@@ -95,9 +95,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java
index 04cd200b..0294bcd5 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java
@@ -100,36 +100,37 @@ public class SigilOfHolding extends EnergyItems
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
//TODO Might be a good idea to have this item need to be in the player's first slot
- this.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{
- if (this.addSigilToInventory(par1ItemStack, par3EntityPlayer))
+ if (par3EntityPlayer.isSneaking())
+ {
+ if (this.addSigilToInventory(par1ItemStack, par3EntityPlayer))
+ {
+ return par1ItemStack;
+ }
+
+ selectNextSlot(par1ItemStack);
+ return par1ItemStack;
+ }
+
+ int currentSlot = this.getSelectedSlot(par1ItemStack);
+ ItemStack[] inv = getInternalInventory(par1ItemStack);
+
+ if (inv == null)
{
return par1ItemStack;
}
- selectNextSlot(par1ItemStack);
- return par1ItemStack;
+ ItemStack itemUsed = inv[currentSlot];
+
+ if (itemUsed == null)
+ {
+ return par1ItemStack;
+ }
+
+ itemUsed.getItem().onItemRightClick(itemUsed, par2World, par3EntityPlayer);
+ saveInternalInventory(par1ItemStack, inv);
}
-
- int currentSlot = this.getSelectedSlot(par1ItemStack);
- ItemStack[] inv = getInternalInventory(par1ItemStack);
-
- if (inv == null)
- {
- return par1ItemStack;
- }
-
- ItemStack itemUsed = inv[currentSlot];
-
- if (itemUsed == null)
- {
- return par1ItemStack;
- }
-
- itemUsed.getItem().onItemRightClick(itemUsed, par2World, par3EntityPlayer);
- saveInternalInventory(par1ItemStack, inv);
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
index eeca93d5..5d498563 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
@@ -96,9 +96,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
index a4a03c51..9871a4ac 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
@@ -98,9 +98,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
index 625b90b7..0887e900 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
@@ -96,9 +96,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
index 7df1491a..5e9347f2 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
@@ -95,9 +95,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java
index 812c3c7d..24dfccb9 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java
@@ -76,9 +76,7 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java
index fa11ff2b..f4c23f6c 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java
@@ -79,9 +79,7 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
*/
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
index 76b4914f..ddb058e4 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
@@ -310,7 +310,12 @@ public class SpellHelper
return false;
}
- if (player instanceof FakePlayer || SpellHelper.getUsername(player).contains("[CoFH]") || SpellHelper.getUsername(player).contains("[Thaumcraft"))
+ return isFakePlayer(player);
+ }
+
+ public static boolean isFakePlayer(EntityPlayer player)
+ {
+ if (player instanceof FakePlayer || SpellHelper.getUsername(player).equals("[CoFH]") || SpellHelper.getUsername(player).startsWith("[Thaumcraft"))
{
return true;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java
index cab42791..94d6bf35 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java
@@ -24,9 +24,7 @@ public class SpellEarthBender extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -44,9 +42,7 @@ public class SpellEarthBender extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -73,9 +69,7 @@ public class SpellEarthBender extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -142,9 +136,7 @@ public class SpellEarthBender extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java
index 6a409224..4bf48cf2 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java
@@ -21,9 +21,7 @@ public class SpellExplosions extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -46,9 +44,7 @@ public class SpellExplosions extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -68,9 +64,7 @@ public class SpellExplosions extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -88,9 +82,7 @@ public class SpellExplosions extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java
index aedc5e1e..744be17b 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java
@@ -27,9 +27,7 @@ public class SpellFireBurst extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -53,9 +51,7 @@ public class SpellFireBurst extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -84,9 +80,7 @@ public class SpellFireBurst extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -123,9 +117,7 @@ public class SpellFireBurst extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java
index 8239b019..2c722f3d 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java
@@ -23,9 +23,7 @@ public class SpellFrozenWater extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -48,9 +46,7 @@ public class SpellFrozenWater extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -166,9 +162,7 @@ public class SpellFrozenWater extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java
index 4548111c..70de8f60 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java
@@ -27,9 +27,7 @@ public class SpellHolyBlast extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -52,9 +50,7 @@ public class SpellHolyBlast extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -109,9 +105,7 @@ public class SpellHolyBlast extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -135,9 +129,7 @@ public class SpellHolyBlast extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java
index 5d6afb60..7dac5a82 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java
@@ -23,9 +23,7 @@ public class SpellLightningBolt extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -49,9 +47,7 @@ public class SpellLightningBolt extends HomSpell
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
//TODO Make it work better...?
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -85,9 +81,7 @@ public class SpellLightningBolt extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -117,9 +111,7 @@ public class SpellLightningBolt extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java
index 66166423..f47098c7 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java
@@ -33,9 +33,7 @@ public class SpellTeleport extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -54,9 +52,7 @@ public class SpellTeleport extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -73,9 +69,7 @@ public class SpellTeleport extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -101,9 +95,7 @@ public class SpellTeleport extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java
index ee9bd426..49d1abfd 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java
@@ -30,9 +30,7 @@ public class SpellWateryGrave extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -50,9 +48,7 @@ public class SpellWateryGrave extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -79,9 +75,7 @@ public class SpellWateryGrave extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -134,9 +128,7 @@ public class SpellWateryGrave extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java
index c3d23d48..506ffc74 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java
@@ -27,9 +27,7 @@ public class SpellWindGust extends HomSpell
@Override
public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -52,9 +50,7 @@ public class SpellWindGust extends HomSpell
@Override
public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -101,9 +97,7 @@ public class SpellWindGust extends HomSpell
@Override
public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}
@@ -142,9 +136,7 @@ public class SpellWindGust extends HomSpell
@Override
public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
- EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
- if (par3EntityPlayer.isSneaking())
+ if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
return par1ItemStack;
}