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

Also apply targeting fix when mind control effect is removed manually

Browse Source
This commit is contained in:
Electroblob77
2020-06-29 21:28:32 +01:00
parent b0d44738c7
commit cfca8f1fdd
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/MindControl.java
+15 -4
View File
@@ -6,8 +6,11 @@ import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems; import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions; import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.registry.WizardrySounds; import electroblob.wizardry.registry.WizardrySounds;
import electroblob.wizardry.util.*; import electroblob.wizardry.util.AllyDesignationSystem;
import electroblob.wizardry.util.EntityUtils;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type; import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.*; import net.minecraft.entity.*;
import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.item.EntityArmorStand;
import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntitySheep;
@@ -217,9 +220,17 @@ public class MindControl extends SpellRay {
@SubscribeEvent @SubscribeEvent
public static void onPotionExpiryEvent(PotionEvent.PotionExpiryEvent event){ public static void onPotionExpiryEvent(PotionEvent.PotionExpiryEvent event){
if(event.getPotionEffect() != null && event.getPotionEffect().getPotion() == WizardryPotions.mind_control onEffectEnd(event.getPotionEffect(), event.getEntity());
&& event.getEntity() instanceof EntityLiving){ }
((EntityLiving)event.getEntity()).setAttackTarget(null); // End effect
@SubscribeEvent
public static void onPotionExpiryEvent(PotionEvent.PotionRemoveEvent event){
onEffectEnd(event.getPotionEffect(), event.getEntity());
}
private static void onEffectEnd(PotionEffect effect, Entity entity){
if(effect != null && effect.getPotion() == WizardryPotions.mind_control && entity instanceof EntityLiving){
((EntityLiving)entity).setAttackTarget(null); // End effect
} }
} }