fix: Fix crash with NPCs drinking potions. Fixes WinDanesz/ArcaneAppr…

…entices#21
WinDanesz · Jun 7, 2024 · 575e548 · 575e548
1 parent 16d43f2
commit 575e548
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/src/main/java/com/windanesz/ancientspellcraft/mixin/modrefs/HandleDiffuserRef.java b/src/main/java/com/windanesz/ancientspellcraft/mixin/modrefs/HandleDiffuserRef.java
@@ -18,31 +18,34 @@
 public class HandleDiffuserRef {
 
 	public static void diffuser(ItemStack stack, World world, EntityLivingBase entityLiving) {
-		EntityPlayer player = (EntityPlayer) entityLiving;
-		if (ItemArtefact.isArtefactActive(player, ASItems.charm_arcane_diffuser)) {
-			List<EntityLivingBase> entities = EntityUtils.getEntitiesWithinRadius(7, player.posX, player.posY, player.posZ, world, EntityLivingBase.class);
-			entities.removeIf(e -> !AllyDesignationSystem.isAllied(player, e));
-			entities.removeIf(e -> e == player);
+		if (entityLiving instanceof EntityPlayer) {
 
-			for (PotionEffect potioneffect : PotionUtils.getEffectsFromStack(stack)) {
-				for (EntityLivingBase entity : entities) {
-					if (potioneffect.getPotion().isInstant()) {
-						potioneffect.getPotion().affectEntity(entity, player, entity, potioneffect.getAmplifier(), 0.3D);
-					} else {
-						entity.addPotionEffect(new PotionEffect(potioneffect.getPotion(), (int) (potioneffect.getDuration() * 0.3f), potioneffect.getAmplifier()));
+			EntityPlayer player = (EntityPlayer) entityLiving;
+			if (ItemArtefact.isArtefactActive(player, ASItems.charm_arcane_diffuser)) {
+				List<EntityLivingBase> entities = EntityUtils.getEntitiesWithinRadius(7, player.posX, player.posY, player.posZ, world, EntityLivingBase.class);
+				entities.removeIf(e -> !AllyDesignationSystem.isAllied(player, e));
+				entities.removeIf(e -> e == player);
+
+				for (PotionEffect potioneffect : PotionUtils.getEffectsFromStack(stack)) {
+					for (EntityLivingBase entity : entities) {
+						if (potioneffect.getPotion().isInstant()) {
+							potioneffect.getPotion().affectEntity(entity, player, entity, potioneffect.getAmplifier(), 0.3D);
+						} else {
+							entity.addPotionEffect(new PotionEffect(potioneffect.getPotion(), (int) (potioneffect.getDuration() * 0.3f), potioneffect.getAmplifier()));
+						}
 					}
 				}
-			}
 
-			if (world.isRemote) {
-				Vec3d origin = player.getPositionVector();
-				for (int i = 0; (float) i < 40.0F; ++i) {
-					double particleX = origin.x - 1.0 + 2.0 * world.rand.nextDouble();
-					double particleZ = origin.z - 1.0 + 2.0 * world.rand.nextDouble();
-					ParticleBuilder.create(ParticleBuilder.Type.DARK_MAGIC).pos(particleX, origin.y + 0.5, particleZ).vel(particleX - origin.x, 0.0, particleZ - origin.z).clr(0xad73bd).spawn(world);
-					particleX = origin.x - 1.0 + 2.0 * world.rand.nextDouble();
-					particleZ = origin.z - 1.0 + 2.0 * world.rand.nextDouble();
-					ParticleBuilder.create(ParticleBuilder.Type.SPARKLE).pos(particleX, origin.y + 0.5, particleZ).vel(particleX - origin.x, 0.0, particleZ - origin.z).time(30).clr(0xa522c9).spawn(world);
+				if (world.isRemote) {
+					Vec3d origin = player.getPositionVector();
+					for (int i = 0; (float) i < 40.0F; ++i) {
+						double particleX = origin.x - 1.0 + 2.0 * world.rand.nextDouble();
+						double particleZ = origin.z - 1.0 + 2.0 * world.rand.nextDouble();
+						ParticleBuilder.create(ParticleBuilder.Type.DARK_MAGIC).pos(particleX, origin.y + 0.5, particleZ).vel(particleX - origin.x, 0.0, particleZ - origin.z).clr(0xad73bd).spawn(world);
+						particleX = origin.x - 1.0 + 2.0 * world.rand.nextDouble();
+						particleZ = origin.z - 1.0 + 2.0 * world.rand.nextDouble();
+						ParticleBuilder.create(ParticleBuilder.Type.SPARKLE).pos(particleX, origin.y + 0.5, particleZ).vel(particleX - origin.x, 0.0, particleZ - origin.z).time(30).clr(0xa522c9).spawn(world);
+					}
 				}
 			}
 		}