maybe make ghast try to target nearest player

Pwn9 · Dec 30, 2019 · 7194807 · 7194807
1 parent a22843d
commit 7194807
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/com/pwn9/PwnRaid/RaidListener.java b/src/com/pwn9/PwnRaid/RaidListener.java
@@ -1,11 +1,14 @@
 package com.pwn9.PwnRaid;
 
+import java.util.List;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Raid;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Player;
@@ -156,14 +159,23 @@ public void spawnGhast(World w, Location loc)
 		ghast.setCustomName("Raid-A-Ghast");
 		ghast.setCustomNameVisible(true);
 
+	    List<Entity> near = ghast.getNearbyEntities(50.0D, 50.0D, 50.0D);
+	    for(Entity entity : near) {
+	        if(entity instanceof Player) {
+	            Player nearPlayer = (Player) entity;
+	            ghast.setTarget(nearPlayer);
+	            return;
+	        }
+	    }
+
 		return;
 	}
 
 	// spawn primed tnt
 	public void spawnTnt(World w, Location loc)
 	{
 		Location newLoc = this.getRandomLocNearby(w, loc, 80);
-		newLoc.setY(newLoc.getY() + 30.00);
+		newLoc.setY(newLoc.getY() + 30.0D);
 		// spawn tnt for kicks
 		w.spawnEntity(newLoc, EntityType.PRIMED_TNT); 
 		return;
@@ -199,7 +211,7 @@ else if (wave == 4)
 			this.spawnGhast(w, loc);
 			this.spawnWitherJockey(w, loc);
 		}		
-		else if (wave > 5 && wave < 8) 
+		else if (wave > 4 && wave < 9) 
 		{
 			this.spawnSuperCreeper(w, loc);
 			this.spawnSuperCreeper(w, loc);
@@ -224,7 +236,7 @@ else if (wave > 8)
 		}
 
 		// artillery
-		if (wave == 3 || wave == 6 || wave == 9 || wave > 9)
+		if (wave == 3 || wave == 6 || wave > 8)
 		{
 			String msg = "PwnRaid: Raid Captain ~ Enough messing around... call in artillery!!!";
 			plugin.getServer().broadcastMessage(ChatColor.RED + msg);