mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Fixed the Flare Chakram returning a Thorn Chakram when picked up instead of the proper Flare Chakram. Closes #1315
This commit is contained in:
1 parent
9fc8856e93
commit
e4be8f3871
1 file changed
+6
-2
@@ -74,7 +74,7 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
motionY = motion.y;
|
||||
motionZ = motion.z;
|
||||
if(MathHelper.pointDistanceSpace(posX, posY, posZ, thrower.posX, thrower.posY, thrower.posZ) < 1)
|
||||
if(!(thrower instanceof EntityPlayer && (((EntityPlayer) thrower).capabilities.isCreativeMode || ((EntityPlayer) thrower).inventory.addItemStackToInventory(new ItemStack(ModItems.thornChakram)))))
|
||||
if(!(thrower instanceof EntityPlayer && (((EntityPlayer) thrower).capabilities.isCreativeMode || ((EntityPlayer) thrower).inventory.addItemStackToInventory(getItemStack()))))
|
||||
dropAndKill();
|
||||
else if(!worldObj.isRemote)
|
||||
setDead();
|
||||
@@ -91,12 +91,16 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
|
||||
private void dropAndKill() {
|
||||
if(!worldObj.isRemote) {
|
||||
ItemStack stack = new ItemStack(ModItems.thornChakram);
|
||||
ItemStack stack = getItemStack();
|
||||
EntityItem item = new EntityItem(worldObj, posX, posY, posZ, stack);
|
||||
worldObj.spawnEntityInWorld(item);
|
||||
setDead();
|
||||
}
|
||||
}
|
||||
|
||||
private ItemStack getItemStack() {
|
||||
return new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onImpact(MovingObjectPosition pos) {
|
||||
|
||||
Reference in new issue
Block a user