fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #584 from SettingDust/bugfix/lighting-web-concurrent-modification

Browse Source 
Try to fix lighting web concurrent modification
This commit is contained in:
Electroblob
2020-12-21 16:39:15 +00:00
committed by GitHub
parent 378e19a614 094ce5a427
commit 3c35eaaf54
1 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/LightningWeb.java
+40 -30
View File
@@ -58,41 +58,51 @@ public class LightningWeb extends SpellRay {
electrocute(world, caster, origin, target, getProperty(PRIMARY_DAMAGE).floatValue() electrocute(world, caster, origin, target, getProperty(PRIMARY_DAMAGE).floatValue()
* modifiers.get(SpellModifiers.POTENCY), ticksInUse); * modifiers.get(SpellModifiers.POTENCY), ticksInUse);
// Secondary chaining effect // Secondary chaining effect
List<EntityLivingBase> secondaryTargets = EntityUtils.getLivingWithinRadius( List<EntityLivingBase> secondaryTargets = EntityUtils.getLivingWithinRadius(
getProperty(SECONDARY_RANGE).floatValue(), target.posX, target.posY + target.height / 2, getProperty(SECONDARY_RANGE).floatValue(), target.posX, target.posY + target.height / 2,
target.posZ, world); target.posZ, world);
secondaryTargets.remove(target); secondaryTargets.stream()
secondaryTargets.removeIf(e -> !EntityUtils.isLiving(e)); .filter(entity -> !entity.equals(target))
secondaryTargets.removeIf(e -> !AllyDesignationSystem.isValidTarget(caster, e)); .filter(EntityUtils::isLiving)
if(secondaryTargets.size() > getProperty(SECONDARY_MAX_TARGETS).intValue()) .filter(e -> AllyDesignationSystem.isValidTarget(caster, e))
secondaryTargets = secondaryTargets.subList(0, getProperty(SECONDARY_MAX_TARGETS).intValue()); .limit(getProperty(SECONDARY_MAX_TARGETS).intValue())
.forEach(secondaryTarget -> {
electrocute(world, caster,
target.getPositionVector().add(0, target.height / 2, 0),
secondaryTarget,
getProperty(SECONDARY_DAMAGE).floatValue() * modifiers.get(SpellModifiers.POTENCY),
ticksInUse
);
for(EntityLivingBase secondaryTarget : secondaryTargets){ // Tertiary chaining effect
electrocute(world, caster, target.getPositionVector().add(0, target.height/2, 0), secondaryTarget, List<EntityLivingBase> tertiaryTargets =
getProperty(SECONDARY_DAMAGE).floatValue() * modifiers.get(SpellModifiers.POTENCY), ticksInUse); EntityUtils.getLivingWithinRadius(
getProperty(TERTIARY_RANGE).floatValue(),
secondaryTarget.posX,
secondaryTarget.posY + secondaryTarget.height / 2,
secondaryTarget.posZ,
world
);
// Tertiary chaining effect tertiaryTargets.stream()
.filter(entity -> !secondaryTargets.contains(entity))
List<EntityLivingBase> tertiaryTargets = EntityUtils.getLivingWithinRadius( .filter(entity -> !entity.equals(target))
getProperty(TERTIARY_RANGE).floatValue(), secondaryTarget.posX, .filter(EntityUtils::isLiving)
secondaryTarget.posY + secondaryTarget.height / 2, secondaryTarget.posZ, world); .filter(e -> AllyDesignationSystem.isValidTarget(caster, e))
.limit(getProperty(TERTIARY_MAX_TARGETS).intValue())
tertiaryTargets.remove(target); .forEach(tertiaryTarget ->
tertiaryTargets.removeAll(secondaryTargets); electrocute(world, caster,
tertiaryTargets.removeIf(e -> !EntityUtils.isLiving(e)); secondaryTarget.getPositionVector().add(0, secondaryTarget.height / 2, 0),
tertiaryTargets.removeIf(e -> !AllyDesignationSystem.isValidTarget(caster, e)); tertiaryTarget,
if(tertiaryTargets.size() > getProperty(TERTIARY_MAX_TARGETS).intValue()) getProperty(TERTIARY_DAMAGE).floatValue() * modifiers.get(SpellModifiers.POTENCY),
tertiaryTargets = tertiaryTargets.subList(0, getProperty(TERTIARY_MAX_TARGETS).intValue()); ticksInUse
)
for(EntityLivingBase tertiaryTarget : tertiaryTargets){ );
electrocute(world, caster, secondaryTarget.getPositionVector().add(0, secondaryTarget.height/2, 0), });
tertiaryTarget, getProperty(TERTIARY_DAMAGE).floatValue() * modifiers.get(SpellModifiers.POTENCY), ticksInUse);
}
}
} }
return true; return true;