diff --git a/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java b/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java index 92ac00a..badc2a1 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java @@ -23,7 +23,7 @@ public class AnvilRitual extends Ritual { @Override public void execute(Player caster, Player target, Location location) { - FallingBlock block = target.getLocation().getWorld().spawnFallingBlock(target.getLocation().clone().add(0, 20, 0), Material.ANVIL, (byte) 0); + FallingBlock block = target.getWorld().spawnFallingBlock(target.getLocation().clone().add(0, 20, 0), Material.ANVIL, (byte) 0); block.setHurtEntities(true); } diff --git a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java index 18982d2..542d8a2 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java @@ -14,7 +14,6 @@ public class BatSpewRitual extends Ritual { addIngredient(Material.WHEAT, 64); addIngredient(Material.IRON_PICKAXE, 1); addSacrifice(EntityType.CHICKEN, 1); - health = 4; name = "bat spew"; backfire = 0.1; } @@ -22,7 +21,7 @@ public class BatSpewRitual extends Ritual { @Override public void execute(Player caster, Player target, Location location) { for (int i = 0; i < 20; i++) { - target.getLocation().getWorld().spawnEntity(target.getLocation(), EntityType.CHICKEN); + target.getWorld().spawnEntity(target.getLocation(), EntityType.CHICKEN); } } diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java index 7625c76..6025a80 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java @@ -21,7 +21,7 @@ public class ChickenSpewRitual extends Ritual { @Override public void execute(Player caster, Player target, Location location) { for (int i = 0; i < 20; i++) { - target.getLocation().getWorld().spawnEntity(target.getLocation(), EntityType.CHICKEN); + target.getWorld().spawnEntity(target.getLocation(), EntityType.CHICKEN); } } diff --git a/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java b/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java index 2a19adc..69ed6f3 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java @@ -2,7 +2,6 @@ package top.penowl.quidproquo.rituals; import java.util.List; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -22,10 +21,10 @@ public class LightningRitual extends Ritual { @Override public void execute(Player caster, Player target, Location location) { // Does this actually get the overworld? - World overworld = Bukkit.getWorld("world"); - List players = overworld.getPlayers(); + World world = location.getWorld(); + List players = world.getPlayers(); for(Player player : players) { - overworld.strikeLightningEffect(player.getLocation().clone().add(0, 1, 0)); + world.strikeLightningEffect(player.getLocation().clone().add(0, 1, 0)); } } diff --git a/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java index 6c31022..0712215 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java @@ -21,7 +21,6 @@ public class WoolingRitual extends Ritual { @Override public void execute(Player caster, Player target, Location location) { - caster.setHealth(Math.min(caster.getMaxHealth(), caster.getHealth()+2.0)); } }