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

Getting ready for release candidate

Browse source
This commit is contained in:
WayofTime 2014-07-10 20:52:05 -04:00
parent 084e3dd348
commit 96930fc47a
18 changed files with 477 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java
View file

@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
@ -73,7 +74,7 @@ public class RitualEffectItemSuction extends RitualEffect
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
} else
{
List<EntityItem> itemDropList = SpellHelper.getItemsInRange(world, x+0.5f, y+0.5f, z+0.5f, 10, 10);
List<EntityItem> itemDropList = SpellHelper.getItemsInRange(world, x+0.5f, y+0.5f, z+0.5f, range, range);
int count = 0;
@ -100,7 +101,10 @@ public class RitualEffectItemSuction extends RitualEffect
copyStack.stackSize = 0;
} else
{
if (itemStack.getItem().equals(copyStack.getItem()) && itemStack.getItemDamage() == copyStack.getItemDamage())
NBTTagCompound data1 = itemStack.getTagCompound();
NBTTagCompound data2 = copyStack.getTagCompound();
//TODO
if (itemStack.getItem().equals(copyStack.getItem()) && itemStack.getItemDamage() == copyStack.getItemDamage() && ((data1 == null && data2 == null) || (data1 != null && data1.equals(data2))))
{
int itemSize = itemStack.stackSize;
int copySize = copyStack.stackSize;