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

Blacklist decoys from being possessed

Browse Source
This commit is contained in:
Electroblob77
2020-06-13 12:55:20 +01:00
parent 36a228489b
commit 7319651ac4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/Possession.java
+5 -4
View File
@@ -68,9 +68,7 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.HashMap; import java.util.*;
import java.util.Map;
import java.util.UUID;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Function; import java.util.function.Function;
@@ -96,6 +94,7 @@ public class Possession extends SpellRay {
private static final Multimap<Class<? extends EntityLiving>, BiConsumer<?, EntityPlayer>> abilities = HashMultimap.create(); private static final Multimap<Class<? extends EntityLiving>, BiConsumer<?, EntityPlayer>> abilities = HashMultimap.create();
private static final Map<Class<? extends EntityLiving>, Function<World, ? extends IProjectile>> projectiles = new HashMap<>(); private static final Map<Class<? extends EntityLiving>, Function<World, ? extends IProjectile>> projectiles = new HashMap<>();
private static final Set<Class<? extends EntityLiving>> blacklist = new HashSet<>();
private static final Map<IAttribute, UUID> INHERITED_ATTRIBUTES; private static final Map<IAttribute, UUID> INHERITED_ATTRIBUTES;
@@ -118,6 +117,7 @@ public class Possession extends SpellRay {
addProjectile(EntityStormElemental.class, EntityLightningDisc::new); addProjectile(EntityStormElemental.class, EntityLightningDisc::new);
addProjectile(EntityWitch.class, EntityPotion::new); addProjectile(EntityWitch.class, EntityPotion::new);
blacklist.add(EntityDecoy.class);
} }
public Possession(){ public Possession(){
@@ -155,7 +155,8 @@ public class Possession extends SpellRay {
protected boolean onEntityHit(World world, Entity target, Vec3d hit, EntityLivingBase caster, Vec3d origin, int ticksInUse, protected boolean onEntityHit(World world, Entity target, Vec3d hit, EntityLivingBase caster, Vec3d origin, int ticksInUse,
SpellModifiers modifiers){ SpellModifiers modifiers){
if(target instanceof EntityLiving && caster instanceof EntityPlayer && !isPossessing((EntityPlayer)caster)){ if(target instanceof EntityLiving && !blacklist.contains(target.getClass()) && caster instanceof EntityPlayer
&& !isPossessing((EntityPlayer)caster)){
EntityPlayer player = (EntityPlayer)caster; EntityPlayer player = (EntityPlayer)caster;