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

Merge master

Browse Source
This commit is contained in:
Edith Boles 2021-10-01 17:54:05 -07:00
commit 84ceb23444
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/top/penowl/quidproquo/rituals/HitRitual.java
View File

@ -11,7 +11,10 @@ public class HitRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.IRON_SWORD, 1); addIngredient(Material.IRON_SWORD, 1);
<<<<<<< HEAD
addIngredient(Material.IRON_INGOT, 1); addIngredient(Material.IRON_INGOT, 1);
=======
>>>>>>> 7f77c0dac5cb9bbd0ceaf70f710f7fdecac3e9ad
addIngredient(Material.WHEAT, 9); addIngredient(Material.WHEAT, 9);
name = "shadow hit"; name = "shadow hit";
health = 1; health = 1;
@ -19,8 +22,14 @@ public class HitRitual extends Ritual {
@Override @Override
public void execute(Player caster, Player target, Location location) { public void execute(Player caster, Player target, Location location) {
<<<<<<< HEAD
target.playSound(target.getLocation(), Sound.HURT_FLESH, 1, 1); target.playSound(target.getLocation(), Sound.HURT_FLESH, 1, 1);
//target.damage(1.0); //target.damage(1.0);
=======
for(int i = 0; i < 3; i ++) {
target.playSound(target.getLocation(), Sound.SUCCESSFUL_HIT, 1, 1);
}
>>>>>>> 7f77c0dac5cb9bbd0ceaf70f710f7fdecac3e9ad
} }
} }