This commit is contained in:
@@ -9,21 +9,23 @@ import org.bukkit.event.entity.PlayerDeathEvent;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
public class DeathMessageCustomiser implements Listener {
|
public class DeathMessageCustomiser implements Listener {
|
||||||
public DeathMessageCustomiser() {}
|
private static final Random random = new Random();
|
||||||
|
private static final String[] FALL_MESSAGES = new String[] {
|
||||||
final String[] FALL_MESSAGES = new String[] {
|
|
||||||
"%p Forgot to use chalk.",
|
"%p Forgot to use chalk.",
|
||||||
"%p Tried to free solo.",
|
"%p Tried to free solo.",
|
||||||
"%p Tried lead climbing.",
|
"%p Tried lead climbing.",
|
||||||
"%p Discovered it was not in fact a jug.",
|
"%p Discovered it was not in fact a jug.",
|
||||||
"It was not a v1 in %p's gym."
|
"It was not a v1 in %p's gym.",
|
||||||
|
"%p slipped on a sloper",
|
||||||
|
"%p thought the ravine was a boulder problem",
|
||||||
|
"%p's fingers were not cut out for crack climbing",
|
||||||
|
"%p got a leg cramp",
|
||||||
|
"%p forgot to check their harness"
|
||||||
};
|
};
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerDeath(PlayerDeathEvent event) {
|
public void onPlayerDeath(PlayerDeathEvent event) {
|
||||||
Random random = new Random();
|
|
||||||
int randomIndex = random.nextInt(FALL_MESSAGES.length);
|
int randomIndex = random.nextInt(FALL_MESSAGES.length);
|
||||||
|
|
||||||
Player player = event.getEntity();
|
Player player = event.getEntity();
|
||||||
|
|
||||||
if (event.getDamageSource().getDamageType() == DamageType.FALL) {
|
if (event.getDamageSource().getDamageType() == DamageType.FALL) {
|
||||||
|
|||||||
@@ -4,16 +4,12 @@ import org.bukkit.*;
|
|||||||
import org.bukkit.entity.Chicken;
|
import org.bukkit.entity.Chicken;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.entity.Wither;
|
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent;
|
import org.bukkit.event.entity.EntityDamageEvent;
|
||||||
import org.bukkit.event.entity.ProjectileHitEvent;
|
import org.bukkit.event.entity.ProjectileHitEvent;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
import org.bukkit.potion.PotionEffect;
|
|
||||||
import org.bukkit.potion.PotionEffectType;
|
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
|
||||||
|
|
||||||
import static org.bukkit.Bukkit.*;
|
import static org.bukkit.Bukkit.*;
|
||||||
|
|
||||||
@@ -24,8 +20,8 @@ public class StevenKillCheck implements Listener {
|
|||||||
if (event.getEntity() instanceof Chicken) {
|
if (event.getEntity() instanceof Chicken) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
|
||||||
if (event.getDamager() instanceof Player player) {
|
if (event.getDamager() instanceof Player heretic) {
|
||||||
destroyHeretic(player);
|
destroyHeretic(heretic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -35,20 +31,20 @@ public class StevenKillCheck implements Listener {
|
|||||||
if (event.getEntity() instanceof Chicken) {
|
if (event.getEntity() instanceof Chicken) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
|
||||||
if ( event.getDamageSource().getCausingEntity() instanceof Player player) {
|
if ( event.getDamageSource().getCausingEntity() instanceof Player heretic) {
|
||||||
destroyHeretic(player);
|
destroyHeretic(heretic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onProjectileHit(ProjectileHitEvent event) {
|
public void onProjectileHit(ProjectileHitEvent event) {
|
||||||
if (event.getHitEntity() instanceof Chicken && event.getEntity().getShooter() instanceof Player player) {
|
if (event.getHitEntity() instanceof Chicken && event.getEntity().getShooter() instanceof Player heretic) {
|
||||||
if (event.getEntity().getType() == EntityType.EGG) return;
|
if (event.getEntity().getType() == EntityType.EGG) return;
|
||||||
if (event.getEntity().getType() == EntityType.SNOWBALL) return;
|
if (event.getEntity().getType() == EntityType.SNOWBALL) return;
|
||||||
|
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
destroyHeretic(player);
|
destroyHeretic(heretic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user