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

Merge pull request #754 from WinDanesz/patch-1228-2

Browse Source 
Remove soulbinding curse effect if the potion is no longer active. fi…
This commit is contained in:
Electroblob
2022-02-01 18:20:37 +00:00
committed by GitHub
parent 9695a85131 f9681d4c66
commit 408a35db8d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/CurseOfSoulbinding.java
+3 -3
View File
@@ -103,9 +103,9 @@ public class CurseOfSoulbinding extends SpellRay {
Entity entity = EntityUtils.getEntityByUUID(player.world, iterator.next()); Entity entity = EntityUtils.getEntityByUUID(player.world, iterator.next());
if(entity == null) iterator.remove(); if (entity == null || (entity instanceof EntityLivingBase && !((EntityLivingBase) entity).isPotionActive(WizardryPotions.curse_of_soulbinding))) {
iterator.remove();
if(entity instanceof EntityLivingBase){ } else if (entity instanceof EntityLivingBase) {
// Retaliatory effect // Retaliatory effect
if(DamageSafetyChecker.attackEntitySafely(entity, MagicDamage.causeDirectMagicDamage(player, if(DamageSafetyChecker.attackEntitySafely(entity, MagicDamage.causeDirectMagicDamage(player,
MagicDamage.DamageType.MAGIC, true), event.getAmount(), event.getSource().getDamageType(), MagicDamage.DamageType.MAGIC, true), event.getAmount(), event.getSource().getDamageType(),