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

Added recipes to Shaped and Deforester charges.

Browse source 
Also fixed bug with Living Armour that prevented it from upgrading under certain conditions.
This commit is contained in:
WayofTime 2021-01-10 09:00:06 -05:00
parent 8e6f36d2a9
commit b3af1b8e77
18 changed files with 104 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java
View file

@ -518,38 +518,42 @@ public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMu
@Override
public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker)
{
if (super.hitEntity(stack, target, attacker))
stack.damageItem(1, attacker, (entity) -> {
entity.sendBreakAnimation(EquipmentSlotType.MAINHAND);
});
// if (super.hitEntity(stack, target, attacker))
// {
if (attacker instanceof PlayerEntity)
{
if (attacker instanceof PlayerEntity)
UUID id = attacker.getUniqueID();
PlayerEntity attackerPlayer = (PlayerEntity) attacker;
// System.out.println("Hit map: " + hitMap.containsKey(id));
if (hitMap.containsKey(id) && hitMap.get(id))
{
UUID id = attacker.getUniqueID();
PlayerEntity attackerPlayer = (PlayerEntity) attacker;
System.out.println("Hit map: " + hitMap.containsKey(id));
if (hitMap.containsKey(id) && hitMap.get(id))
{
EnumDemonWillType type = this.getCurrentType(stack);
double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer);
int willBracket = this.getLevel(stack, will);
applyEffectToEntity(type, willBracket, target, attackerPlayer);
} else
{
this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer);
EnumDemonWillType type = this.getCurrentType(stack);
double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer);
int willBracket = this.getLevel(stack, will);
hitMap.put(id, true);
this.attackEntitiesInAreaExcludingEntity(stack, attackerPlayer, type, willBracket, target);
hitMap.remove(id);
}
EnumDemonWillType type = this.getCurrentType(stack);
double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer);
int willBracket = this.getLevel(stack, will);
applyEffectToEntity(type, willBracket, target, attackerPlayer);
} else
{
this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer);
EnumDemonWillType type = this.getCurrentType(stack);
double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer);
int willBracket = this.getLevel(stack, will);
hitMap.put(id, true);
this.attackEntitiesInAreaExcludingEntity(stack, attackerPlayer, type, willBracket, target);
hitMap.remove(id);
}
return true;
}
return false;
return true;
// }
// return false;
}
@Override