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

Merge branch 'main' of github.com:PenguinOwl/QuidProQuo

Browse Source
This commit is contained in:
Edith Boles 2021-10-04 21:26:35 -07:00
commit d88c3a062c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/top/penowl/quidproquo/rituals/FakePlayerRitual.java
View File

@ -9,6 +9,8 @@ import org.bukkit.entity.Slime;
import org.bukkit.inventory.EntityEquipment;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import java.util.Random;
@ -38,6 +40,7 @@ public class FakePlayerRitual extends Ritual {
armorStand.setCustomName(caster.getName());
armorStand.setCustomNameVisible(true);
slime.setPassenger(armorStand);
slime.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 10*20, 50));
slime.setSize(1);
EntityEquipment equipment = armorStand.getEquipment();
ItemStack skull = new ItemStack(Material.SKULL_ITEM, 1, (short) 3);

2
src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java
View File

@ -17,7 +17,7 @@ public class KickingRitual extends Ritual {
health = 3;
name = "kicking";
backfire = 0.4;
description = "Kick your enemy from the server!";
description = "ADMIN ABUSE!";
}
@Override

1
src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java
View File

@ -22,7 +22,6 @@ public class LightningRitual extends Ritual {
@Override
public void execute(Player caster, Player target, Location location) {
// Does this actually get the overworld?
World world = location.getWorld();
List<Player> players = world.getPlayers();
for(Player player : players) {