Skip to content
This repository has been archived by the owner on Dec 8, 2024. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
MerchantPug committed May 18, 2024
1 parent c7f6ed9 commit 5d4bc57
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
## Bugfixes
- Fixed `modify_scale` sometimes not syncing when scales are applied. (#70)
- Fixed a `modify_enchantment_level` related NullPointerException crash. (#73)
- Fixed `damage_nearby_x_hit` power type running attacker, target bientity conditions without an attacker. ([toomanyorigins#87](https://github.com/MerchantPug/toomanyorigins/issues/87))
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static SerializableData getSerializableData() {
default void execute(P power, LivingEntity powerHolder, DamageSource damageSource, float damageAmount, @Nullable Entity attacker, LivingEntity target,
String attackerName, String targetName, boolean damagerIsAttacker) {
SerializableData.Instance data = getDataFromPower(power);
if (canUse(power, powerHolder) && (!data.isPresent("damage_condition") || Services.CONDITION.checkDamage(data, "damage_condition", damageSource, damageAmount)) && (attacker == null && !data.isPresent(attackerName + "_" + targetName + "_bientity_condition") || Services.CONDITION.checkBiEntity(data, attackerName + "_" + targetName + "_bientity_condition", attacker, target))) {
if (canUse(power, powerHolder) && (!data.isPresent("damage_condition") || Services.CONDITION.checkDamage(data, "damage_condition", damageSource, damageAmount)) && (!data.isPresent(attackerName + "_" + targetName + "_bientity_condition") || attacker != null && Services.CONDITION.checkBiEntity(data, attackerName + "_" + targetName + "_bientity_condition", attacker, target))) {
float radius = data.getFloat("radius");
List<?> modifiers = new ArrayList<>();
if (data.isPresent("modifiers"))
Expand Down

0 comments on commit 5d4bc57

Please sign in to comment.