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

Fixed #677

Browse source
This commit is contained in:
WayofTime 2016-03-19 08:47:59 -04:00
parent 48b3a7ce8b
commit b86f7c24ed
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -33,6 +33,7 @@ import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.util.helper.TextHelper; import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider
@ -105,11 +106,11 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
@Override @Override
public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack)
{ {
Multimap<String, AttributeModifier> multimap = super.getItemAttributeModifiers(equipmentSlot); Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
if (equipmentSlot == EntityEquipmentSlot.MAINHAND) if (equipmentSlot == EntityEquipmentSlot.MAINHAND)
{ {
double damage = getActivated(stack) ? this.attackDamage : 1.0D; multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 12 : 2, 0));
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", damage, 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4, 0));
} }
return multimap; return multimap;
} }

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

@ -707,7 +707,7 @@ public class EventHandler
if (entity != null && entity instanceof EntityPlayer) if (entity != null && entity instanceof EntityPlayer)
{ {
EntityPlayer player = (EntityPlayer) entity; EntityPlayer player = (EntityPlayer) entity;
ItemStack heldStack = player.getActiveItemStack(); ItemStack heldStack = player.getHeldItemMainhand();
if (heldStack != null && heldStack.getItem() instanceof IDemonWillWeapon && !player.worldObj.isRemote) if (heldStack != null && heldStack.getItem() instanceof IDemonWillWeapon && !player.worldObj.isRemote)
{ {
IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem(); IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem();