From af78559783f29373585089cf49c2eb548510c044 Mon Sep 17 00:00:00 2001
From: Minecon724 <m1necon724@protonmail.com>
Date: Sat, 29 Jan 2022 18:32:59 +0100
Subject: [PATCH] almost there

---
 src/main/java/pl/minecon724/giants/Main.java | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/pl/minecon724/giants/Main.java b/src/main/java/pl/minecon724/giants/Main.java
index 15bfb70..9f631b5 100644
--- a/src/main/java/pl/minecon724/giants/Main.java
+++ b/src/main/java/pl/minecon724/giants/Main.java
@@ -20,6 +20,7 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -80,7 +81,8 @@ public class Main extends JavaPlugin implements Listener {
 		new BukkitRunnable() {
 			@Override
 			public void run() {
-				for (Entity e : giants) { 
+				for (Entity e : giants) {
+					if (!(e.isValid())) continue;
 					Collection<Entity> nearby = e.getWorld().getNearbyEntities(e.getBoundingBox().expand(
 							attackReach, expandUp, attackReach), n -> (n instanceof Player));
 					for (Entity p : nearby) {
@@ -116,22 +118,30 @@ public class Main extends JavaPlugin implements Listener {
 		}
 	}
 	
+	@EventHandler
+	public void entityDamage(EntityDamageByEntityEvent e) {
+		LivingEntity entity = (LivingEntity) e.getDamager();
+		if (entity.hasMetadata("giant")) {
+			entity.setInvulnerable(false);
+			entity.setHealth(0);
+		}
+	}
+	
 	@EventHandler
 	public void entityDeath(EntityDeathEvent e) {
-		Entity entity = e.getEntity();
+		LivingEntity entity = e.getEntity();
 		if (entity.getType() == EntityType.GIANT) {
+			giants.remove(entity);
 			for (Entity p : entity.getPassengers()) ((LivingEntity) p).setHealth(0);
 		}
 	}
 	
-	Entity spawnGiant(boolean ai, Location pos) {
+	LivingEntity spawnGiant(boolean ai, Location pos) {
 		LivingEntity entity = (LivingEntity) pos.getWorld().spawnEntity(pos, EntityType.GIANT);
 		if (ai) {
 			LivingEntity passenger = (LivingEntity) pos.getWorld().spawnEntity(pos, EntityType.HUSK);
 		    new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1)
 		    	.apply((LivingEntity) passenger);
-		    new PotionEffect(PotionEffectType.WEAKNESS, Integer.MAX_VALUE, 255)
-	    		.apply((LivingEntity) passenger);
 		    passenger.setCustomName("Giant");
 		    passenger.setCustomNameVisible(false);
 		    passenger.setInvulnerable(true);