upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the Black Hole Talisman being able to place blocks inside the player. Closes #1043

Browse Source
This commit is contained in:
Lizbeth Rika committed 2015-06-08 23:16:30 +01:00
1 parent a8752d321c
commit fda48ab6b9
1 file changed
+12 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java
+12 -4
View File
@@ -16,6 +16,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
@@ -23,9 +24,11 @@ import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
import vazkii.botania.client.core.helper.IconHelper;
@@ -103,10 +106,15 @@ public class ItemBlackHoleTalisman extends ItemMod {
}
}
} else {
int remove = remove(par1ItemStack, 1);
if(remove > 0) {
Item.getItemFromBlock(bBlock).onItemUse(new ItemStack(bBlock, 1, bmeta), par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
set = true;
ForgeDirection dir = ForgeDirection.getOrientation(par7);
int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size();
if(entities == 0) {
int remove = remove(par1ItemStack, 1);
if(remove > 0) {
Item.getItemFromBlock(bBlock).onItemUse(new ItemStack(bBlock, 1, bmeta), par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
set = true;
}
}
}
}