Repo-Mirror/EcoMobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoMobs.git synced 2025-12-22 16:39:25 +00:00
Code Issues Releases 1 Activity

Merge pull request #13

Browse Source 
Fixed double egg consuming, added null check for all attributes
This commit is contained in:
Will FP
2021-11-27 13:25:23 +00:00
committed by GitHub
parent 770ee369e5 470f39da09
commit a995568485
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
View File

@@ -150,18 +150,23 @@ public class LivingEcoBoss extends PluginDependent<EcoPlugin> {
movementSpeed.addModifier(new AttributeModifier(entity.getUniqueId(), "ecobosses-movement-multiplier", boss.getMovementSpeedMultiplier() - 1, AttributeModifier.Operation.MULTIPLY_SCALAR_1)); movementSpeed.addModifier(new AttributeModifier(entity.getUniqueId(), "ecobosses-movement-multiplier", boss.getMovementSpeedMultiplier() - 1, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
AttributeInstance maxHealth = entity.getAttribute(Attribute.GENERIC_MAX_HEALTH); AttributeInstance maxHealth = entity.getAttribute(Attribute.GENERIC_MAX_HEALTH);
assert maxHealth != null; if (maxHealth != null) {
maxHealth.setBaseValue(boss.getMaxHealth()); maxHealth.getModifiers().clear();
maxHealth.setBaseValue(boss.getMaxHealth());
entity.setHealth(maxHealth.getValue()); entity.setHealth(maxHealth.getValue());
}
AttributeInstance followRange = entity.getAttribute(Attribute.GENERIC_FOLLOW_RANGE); AttributeInstance followRange = entity.getAttribute(Attribute.GENERIC_FOLLOW_RANGE);
assert followRange != null; if (followRange != null) {
followRange.setBaseValue(boss.getFollowRange()); followRange.getModifiers().clear();
followRange.setBaseValue(boss.getFollowRange());
}
AttributeInstance attackDamage = entity.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE); AttributeInstance attackDamage = entity.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE);
assert attackDamage != null; if (attackDamage != null) {
attackDamage.setBaseValue(boss.getAttackDamage()); attackDamage.getModifiers().clear();
attackDamage.setBaseValue(boss.getAttackDamage());
}
for (OptionedSound sound : boss.getSpawnSounds()) { for (OptionedSound sound : boss.getSpawnSounds()) {
entity.getWorld().playSound(entity.getLocation(), sound.sound(), sound.volume(), sound.pitch()); entity.getWorld().playSound(entity.getLocation(), sound.sound(), sound.volume(), sound.pitch());

2
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java
View File

@@ -134,8 +134,6 @@ public class SpawnListeners extends PluginDependent<EcoPlugin> implements Listen
return; return;
} }
item.setAmount(item.getAmount() - 1);
if (event.getHand() == EquipmentSlot.HAND) { if (event.getHand() == EquipmentSlot.HAND) {
ItemStack hand = event.getPlayer().getInventory().getItemInMainHand(); ItemStack hand = event.getPlayer().getInventory().getItemInMainHand();
hand.setAmount(hand.getAmount() - 1); hand.setAmount(hand.getAmount() - 1);