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

Changed wills to go straight to inventory and only drop excess (#654)

Browse source
This commit is contained in:
Nick 2016-03-15 19:50:03 -07:00
parent 6a6cb53d8f
commit 2700841973
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -699,32 +699,31 @@ public class EventHandler
event.drops.add(new EntityItem(attackedEntity.worldObj, attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack)); event.drops.add(new EntityItem(attackedEntity.worldObj, attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack));
} }
if (entity != null && entity instanceof EntityLivingBase) if (entity != null && entity instanceof EntityPlayer)
{ {
EntityLivingBase attackingEntity = (EntityLivingBase) entity; EntityPlayer player = (EntityPlayer) entity;
ItemStack heldStack = attackingEntity.getHeldItem(); ItemStack heldStack = player.getHeldItem();
if (heldStack != null && heldStack.getItem() instanceof IDemonWillWeapon) if (heldStack != null && heldStack.getItem() instanceof IDemonWillWeapon && !player.worldObj.isRemote)
{ {
List<ItemStack> droppedSouls = ((IDemonWillWeapon) heldStack.getItem()).getRandomDemonWillDrop(attackedEntity, attackingEntity, heldStack, event.lootingLevel); IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem();
List<ItemStack> droppedSouls = demonWillWeapon.getRandomDemonWillDrop(attackedEntity, player, heldStack, event.lootingLevel);
if (!droppedSouls.isEmpty()) if (!droppedSouls.isEmpty())
{ {
for (ItemStack soulStack : droppedSouls) ItemStack remainder;
for (ItemStack willStack : droppedSouls)
{ {
event.drops.add(new EntityItem(attackedEntity.worldObj, attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack)); remainder = PlayerDemonWillHandler.addDemonWill(player, willStack);
if (remainder != null && ((IDemonWill) remainder.getItem()).getWill(remainder) >= 0.0001)
event.drops.add(new EntityItem(attackedEntity.worldObj, attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, remainder));
} }
player.inventoryContainer.detectAndSendChanges();
} }
} }
if (heldStack != null && heldStack.getItem() == ModItems.boundSword && !(attackedEntity instanceof EntityAnimal)) if (heldStack != null && heldStack.getItem() == ModItems.boundSword && !(attackedEntity instanceof EntityAnimal))
{ for (int i = 0; i <= EnchantmentHelper.getLootingModifier(player); i++)
for (int i = 0; i <= EnchantmentHelper.getLootingModifier(attackingEntity); i++)
{
if (this.random.nextDouble() < 0.2) if (this.random.nextDouble() < 0.2)
{
event.drops.add(new EntityItem(attackedEntity.worldObj, attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(ModItems.bloodShard, 1, 0))); event.drops.add(new EntityItem(attackedEntity.worldObj, attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(ModItems.bloodShard, 1, 0)));
}
}
}
} }
} }