diff --git a/src/main/java/top/penowl/quidproquo/Commands.java b/src/main/java/top/penowl/quidproquo/Commands.java index b6af55e..2ab5e83 100644 --- a/src/main/java/top/penowl/quidproquo/Commands.java +++ b/src/main/java/top/penowl/quidproquo/Commands.java @@ -96,7 +96,9 @@ public class Commands implements CommandExecutor, TabCompleter { builder.append(" [Back]"); builder.color(net.md_5.bungee.api.ChatColor.GOLD); builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rt list 1 d")); - builder.append("\n" +ChatColor.DARK_PURPLE + ChatColor.ITALIC + ritual.description); + builder.append("\n" + ritual.description); + builder.color(net.md_5.bungee.api.ChatColor.DARK_PURPLE); + builder.italic(true); builder.append("\n\n" + ChatColor.GREEN + "" + ChatColor.BOLD + "Ingredients:\n"); for (Map.Entry entry : ritual.ingredients.entrySet()) { builder.append(WordUtils.capitalizeFully(entry.getKey().toString().replace('_', ' ').toLowerCase())); diff --git a/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java b/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java index d3a2724..46cb1bb 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java @@ -13,7 +13,7 @@ public class BlockShiftRitual extends Ritual { //possible mats private static final Material[] pMat = { Material.STONE, Material.GRASS, Material.DIRT, Material.COBBLESTONE, Material.WOOD, - Material.WATER, Material.LAVA, Material.SAND, Material.GRAVEL, Material.GOLD_ORE, + Material.STATIONARY_WATER, Material.LAVA, Material.SAND, Material.GRAVEL, Material.GOLD_ORE, Material.IRON_ORE, Material.COAL_ORE, Material.LOG, Material.LEAVES, Material.SPONGE, Material.GLASS, Material.LAPIS_ORE, Material.LAPIS_BLOCK, Material.SANDSTONE, Material.WEB, Material.WOOL, Material.GOLD_BLOCK, Material.IRON_BLOCK, Material.BRICK, diff --git a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java index 1d4140d..4e9013c 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java @@ -16,12 +16,13 @@ public class HardPenorRitual extends Ritual { addIngredient(Material.REDSTONE, 16); addIngredient(Material.WHEAT, 32); name = "erection"; + backfire = 0.1; description = "Erect a hard penor around yourself."; } @Override public void execute(Player caster, Player target, Location location) { - Block shaft = caster.getLocation().getBlock(); + Block shaft = target.getLocation().getBlock(); Block ball1 = shaft.getRelative(2, 0, -1); Block ball2 = shaft.getRelative(-2, 0, -1); for(int d = 0; d < 8; d ++) { diff --git a/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java index 3e1a02e..e77270f 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java @@ -11,7 +11,7 @@ public class KickingRitual extends Ritual { @Override public void setup() { addIngredient(Material.WHEAT, 64*2); - addIngredient(Material.FLOWER_POT, 1); + addIngredient(Material.FLOWER_POT_ITEM, 1); addIngredient(Material.LOG, 1); addIngredient(Material.IRON_BOOTS, 1); health = 3; diff --git a/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java b/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java index f8ba0ca..0e91dc7 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java @@ -25,6 +25,7 @@ public class RotateRitual extends Ritual { public void execute(Player caster, Player target, Location location) { Location targetLocation = target.getLocation(); targetLocation.setDirection(targetLocation.getDirection().multiply(-1)); + target.teleport(targetLocation); } } diff --git a/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java b/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java index 26b8f42..bce3b10 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java @@ -14,7 +14,7 @@ public class WitherRitual extends Ritual { addIngredient(Material.BONE, 64); addIngredient(Material.WHEAT, 64*9); addSacrifice(EntityType.SKELETON, 1); - addIngredient(Material.FLOWER_POT, 1); + addIngredient(Material.FLOWER_POT_ITEM, 1); addIngredient(Material.SAND, 1); name = "wither summoning"; health = 2;