From eb8b70a6f15cc1436cc7710abdd7bc3f06ad726c Mon Sep 17 00:00:00 2001
From: Edith Boles <edith@penguinowl.dev>
Date: Fri, 1 Oct 2021 20:25:55 -0700
Subject: [PATCH] Fix herobrine ritual

---
 .../java/top/penowl/quidproquo/Commands.java  |  6 ++---
 .../java/top/penowl/quidproquo/Events.java    |  2 +-
 .../quidproquo/rituals/HerobrineRitual.java   | 26 ++++++-------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/main/java/top/penowl/quidproquo/Commands.java b/src/main/java/top/penowl/quidproquo/Commands.java
index 7d3b3c1..04dbd93 100644
--- a/src/main/java/top/penowl/quidproquo/Commands.java
+++ b/src/main/java/top/penowl/quidproquo/Commands.java
@@ -16,7 +16,7 @@ public class Commands implements CommandExecutor {
 
     public Commands(List<Ritual> rituals) {
         for (Ritual ritual : rituals) {
-            recipes.put(ritual.name.toUpperCase(), ritual);
+            recipes.put(ritual.name.toLowerCase(), ritual);
         }
     }
 
@@ -28,7 +28,7 @@ public class Commands implements CommandExecutor {
         } else if (args[0].toLowerCase().equals("list")) {
             List<String> ritualNames = new ArrayList<String>(recipes.keySet());
             int max = ritualNames.size() - 1;
-            int maxPages = max / 10;
+            int maxPages = max / 9;
             int page = 0;
             try {
                 page = Math.min(Math.max(Integer.parseInt(args[1]) - 1, 0), maxPages);
@@ -37,7 +37,7 @@ public class Commands implements CommandExecutor {
             StringBuilder builder = new StringBuilder();
             builder.append(ChatColor.DARK_PURPLE + "======== Rituals ========    " + ChatColor.YELLOW + "Page " + String.valueOf(page + 1) + " / " + String.valueOf(maxPages + 1));
             builder.append("\n" + ChatColor.GREEN);
-            for (int i = page * 10; i < Math.min(page * 10 + 10, max + 1); i++) {
+            for (int i = page * 9; i < Math.min(page * 9 + 9, max + 1); i++) {
                 builder.append(ritualNames.get(i));
                 builder.append("\n" + ChatColor.GREEN);
             }
diff --git a/src/main/java/top/penowl/quidproquo/Events.java b/src/main/java/top/penowl/quidproquo/Events.java
index 4e53c0a..e7ae332 100644
--- a/src/main/java/top/penowl/quidproquo/Events.java
+++ b/src/main/java/top/penowl/quidproquo/Events.java
@@ -162,7 +162,7 @@ public final class Events implements Listener {
                 }
 
                 // administer health penalty
-                player.setHealth(player.getHealth() - ritual.health);
+                player.setHealth(Math.max(0, player.getHealth() - ritual.health));
 
                 // shiny message
                 player.sendMessage(ChatColor.GREEN + "You enacted a " + ritual.name + " ritual.");
diff --git a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java
index f3fb5b4..cf3e8e9 100644
--- a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java
+++ b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java
@@ -4,6 +4,7 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.entity.EntityType;
 
 import top.penowl.quidproquo.Ritual;
@@ -21,26 +22,15 @@ public class HerobrineRitual extends Ritual {
     @Override
     public void execute(Player caster, Player target, Location location) {
         Location targetLocation = target.getLocation();
-        double targX = targetLocation.getX();
-        double targY = targetLocation.getY();
-        double targZ = targetLocation.getZ();
-        World world = targetLocation.getWorld();
-        boolean foundSpawnLoc = false;
-        Location spawnLoc;
-        for(int direction = 0; direction < 16; direction ++) {
-            double rads = Math.toRadians(direction * 24);
-            double testX = targX + 20 * Math.sin(rads);
-            double testZ = targY + 20 * Math.cos(rads);
-            if((new Location(world, testX, targY, testZ).getBlock().getType() == Material.AIR) && 
-                (new Location(world, testX, targY + 1, testZ).getBlock().getType() == Material.AIR)) {
-                    spawnLoc = new Location(world, testX, targY, testZ);
-                    foundSpawnLoc = true;
-                    world.spawnEntity(spawnLoc, EntityType.ZOMBIE);
-                    break;
+        Block block = targetLocation.clone().add(0, 1, 0).getBlock();
+        for (int x = -5; x <= 5; x++) {
+            for (int z = -5; z <= 5; z++) {
+                if(block.getRelative(x, 0, z).getType() == Material.AIR) {
+                    targetLocation.getWorld().spawnEntity(targetLocation.clone().add(x, 1, z), EntityType.ZOMBIE);
+                    return;
+                }
             }
         }
-        if(foundSpawnLoc == false)
-            world.spawnEntity(new Location(world, targX, targY, targZ), EntityType.ZOMBIE);
     }
     
 }