Merge master
This commit is contained in:
commit
84ceb23444
@ -11,7 +11,10 @@ public class HitRitual extends Ritual {
|
||||
@Override
|
||||
public void setup() {
|
||||
addIngredient(Material.IRON_SWORD, 1);
|
||||
<<<<<<< HEAD
|
||||
addIngredient(Material.IRON_INGOT, 1);
|
||||
=======
|
||||
>>>>>>> 7f77c0dac5cb9bbd0ceaf70f710f7fdecac3e9ad
|
||||
addIngredient(Material.WHEAT, 9);
|
||||
name = "shadow hit";
|
||||
health = 1;
|
||||
@ -19,8 +22,14 @@ public class HitRitual extends Ritual {
|
||||
|
||||
@Override
|
||||
public void execute(Player caster, Player target, Location location) {
|
||||
<<<<<<< HEAD
|
||||
target.playSound(target.getLocation(), Sound.HURT_FLESH, 1, 1);
|
||||
//target.damage(1.0);
|
||||
=======
|
||||
for(int i = 0; i < 3; i ++) {
|
||||
target.playSound(target.getLocation(), Sound.SUCCESSFUL_HIT, 1, 1);
|
||||
}
|
||||
>>>>>>> 7f77c0dac5cb9bbd0ceaf70f710f7fdecac3e9ad
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user