diff --git a/src/main/java/top/penowl/quidproquo/QuidProQuo.java b/src/main/java/top/penowl/quidproquo/QuidProQuo.java index 4966c73..b36b170 100644 --- a/src/main/java/top/penowl/quidproquo/QuidProQuo.java +++ b/src/main/java/top/penowl/quidproquo/QuidProQuo.java @@ -42,23 +42,24 @@ public class QuidProQuo extends JavaPlugin { rituals.add(new FakePlayerRitual()); rituals.add(new FeedingRitual()); rituals.add(new FillerRitual()); + rituals.add(new GBJRitual()); rituals.add(new GetLuckyRitual()); + rituals.add(new HardPenorRitual()); rituals.add(new HealRitual()); rituals.add(new HerobrineRitual()); rituals.add(new HitRitual()); rituals.add(new LavaRitual()); - rituals.add(new LightningRitual()); rituals.add(new LightQuicktimeRitual()); + rituals.add(new LightningRitual()); + rituals.add(new MidasRitual()); rituals.add(new QuicktimeRitual()); rituals.add(new RotateRitual()); rituals.add(new SnowmanRitual()); rituals.add(new SoftPenorRitual()); rituals.add(new SoundRitual()); + rituals.add(new SummoningRitual()); rituals.add(new WitherRitual()); rituals.add(new WoolingRitual()); - rituals.add(new MidasRitual()); - rituals.add(new SummoningRitual()); - rituals.add(new GBJRitual()); // run ritual setup scripts for (Ritual ritual : rituals) { diff --git a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java index bca8e44..6cbedbb 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java @@ -15,7 +15,6 @@ public class HardPenorRitual extends Ritual { addIngredient(Material.BONE, 1); addIngredient(Material.REDSTONE, 16); addIngredient(Material.WHEAT, 32); - backfire = 0.10; name = "erection"; } @@ -34,7 +33,7 @@ public class HardPenorRitual extends Ritual { for(int y = 0; y < 12; y++) { Block changingBlock = shaft.getRelative(x,y,z); if(changingBlock.getType() == Material.AIR) - changingBlock.setType(Material.SAND); + changingBlock.setType(Material.COBBLESTONE); } } for(int x = 0; x < 3; x ++) { @@ -43,9 +42,9 @@ public class HardPenorRitual extends Ritual { Block changingBlock1 = ball1.getRelative(x,y,z); Block changingBlock2 = ball2.getRelative(x*-1,y,z); if(changingBlock1.getType() == Material.AIR) - changingBlock1.setType(Material.SAND); + changingBlock1.setType(Material.COBBLESTONE); if(changingBlock2.getType() == Material.AIR) - changingBlock2.setType(Material.SAND); + changingBlock2.setType(Material.COBBLESTONE); } } } diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java index a5c459c..8ec7a07 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java @@ -5,7 +5,6 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; import java.util.Random; - import top.penowl.quidproquo.Ritual; public class SoundRitual extends Ritual {