PenguinOwl/QuidProQuo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix herobrine ritual

Browse Source
This commit is contained in:
Edith Boles 2021-10-01 20:25:55 -07:00
parent 98de7f7aea
commit eb8b70a6f1
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/top/penowl/quidproquo/Commands.java
View File

@ -16,7 +16,7 @@ public class Commands implements CommandExecutor {
public Commands(List<Ritual> rituals) { public Commands(List<Ritual> rituals) {
for (Ritual 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")) { } else if (args[0].toLowerCase().equals("list")) {
List<String> ritualNames = new ArrayList<String>(recipes.keySet()); List<String> ritualNames = new ArrayList<String>(recipes.keySet());
int max = ritualNames.size() - 1; int max = ritualNames.size() - 1;
int maxPages = max / 10; int maxPages = max / 9;
int page = 0; int page = 0;
try { try {
page = Math.min(Math.max(Integer.parseInt(args[1]) - 1, 0), maxPages); 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(); StringBuilder builder = new StringBuilder();
builder.append(ChatColor.DARK_PURPLE + "======== Rituals ======== " + ChatColor.YELLOW + "Page " + String.valueOf(page + 1) + " / " + String.valueOf(maxPages + 1)); builder.append(ChatColor.DARK_PURPLE + "======== Rituals ======== " + ChatColor.YELLOW + "Page " + String.valueOf(page + 1) + " / " + String.valueOf(maxPages + 1));
builder.append("\n" + ChatColor.GREEN); 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(ritualNames.get(i));
builder.append("\n" + ChatColor.GREEN); builder.append("\n" + ChatColor.GREEN);
} }

2
src/main/java/top/penowl/quidproquo/Events.java
View File

@ -162,7 +162,7 @@ public final class Events implements Listener {
} }
// administer health penalty // administer health penalty
player.setHealth(player.getHealth() - ritual.health); player.setHealth(Math.max(0, player.getHealth() - ritual.health));
// shiny message // shiny message
player.sendMessage(ChatColor.GREEN + "You enacted a " + ritual.name + " ritual."); player.sendMessage(ChatColor.GREEN + "You enacted a " + ritual.name + " ritual.");

26
src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java
View File

@ -4,6 +4,7 @@ import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import top.penowl.quidproquo.Ritual; import top.penowl.quidproquo.Ritual;
@ -21,26 +22,15 @@ public class HerobrineRitual extends Ritual {
@Override @Override
public void execute(Player caster, Player target, Location location) { public void execute(Player caster, Player target, Location location) {
Location targetLocation = target.getLocation(); Location targetLocation = target.getLocation();
double targX = targetLocation.getX(); Block block = targetLocation.clone().add(0, 1, 0).getBlock();
double targY = targetLocation.getY(); for (int x = -5; x <= 5; x++) {
double targZ = targetLocation.getZ(); for (int z = -5; z <= 5; z++) {
World world = targetLocation.getWorld(); if(block.getRelative(x, 0, z).getType() == Material.AIR) {
boolean foundSpawnLoc = false; targetLocation.getWorld().spawnEntity(targetLocation.clone().add(x, 1, z), EntityType.ZOMBIE);
Location spawnLoc; return;
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;
} }
} }
if(foundSpawnLoc == false)
world.spawnEntity(new Location(world, targX, targY, targZ), EntityType.ZOMBIE);
} }
} }