added funny death messages
Java CI with Maven / build (push) Successful in 28s

This commit is contained in:
2025-08-29 00:46:27 +01:00
parent 03d01f9422
commit a4254a94f4
4 changed files with 41 additions and 11 deletions
@@ -1,9 +1,6 @@
package dev.zxq5.fantasysmp; package dev.zxq5.fantasysmp;
import dev.zxq5.fantasysmp.events.Chat; import dev.zxq5.fantasysmp.events.*;
import dev.zxq5.fantasysmp.events.HereticWarner;
import dev.zxq5.fantasysmp.events.StevenKillCheck;
import dev.zxq5.fantasysmp.events.XrayDetector;
import dev.zxq5.fantasysmp.groups.Commands; import dev.zxq5.fantasysmp.groups.Commands;
import dev.zxq5.fantasysmp.groups.Team; import dev.zxq5.fantasysmp.groups.Team;
import dev.zxq5.fantasysmp.items.*; import dev.zxq5.fantasysmp.items.*;
@@ -39,6 +36,7 @@ public final class Fantasysmp extends JavaPlugin {
getServer().getPluginManager().registerEvents(new Chat(), this); getServer().getPluginManager().registerEvents(new Chat(), this);
getServer().getPluginManager().registerEvents(new StevenKillCheck(), this); getServer().getPluginManager().registerEvents(new StevenKillCheck(), this);
getServer().getPluginManager().registerEvents(new DeathMessageCustomiser(), this);
HereticWarner hereticWarner = new HereticWarner(); HereticWarner hereticWarner = new HereticWarner();
hereticWarner.checkHereticInventory(); hereticWarner.checkHereticInventory();
@@ -4,17 +4,19 @@ import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class Chat { public class Chat {
public static String EVENTPREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET; public static final String EVENT_PREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET;
private Chat() {}
public static void success(Player player, String message) { public static void success(Player player, String message) {
player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message); player.sendMessage(EVENT_PREFIX + ChatColor.GREEN + message);
} }
public static void error(Player player, String message) { public static void error(Player player, String message) {
player.sendMessage(EVENTPREFIX + ChatColor.RED + message); player.sendMessage(EVENT_PREFIX + ChatColor.RED + message);
} }
public static void info(Player player, String message) { public static void info(Player player, String message) {
player.sendMessage(EVENTPREFIX + message); player.sendMessage(EVENT_PREFIX + message);
} }
} }
@@ -0,0 +1,33 @@
package dev.zxq5.fantasysmp.events;
import org.bukkit.damage.DamageType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
import java.util.Random;
public class DeathMessageCustomiser implements Listener {
public DeathMessageCustomiser() {}
final String[] FALL_MESSAGES = new String[] {
"%p Forgot to use chalk.",
"%p Tried to free solo.",
"%p Tried lead climbing.",
"%p Discovered it was not in fact a jug.",
"It was not a v1 in %p's gym."
};
@EventHandler
public void onPlayerDeath(PlayerDeathEvent event) {
Random random = new Random();
int randomIndex = random.nextInt(FALL_MESSAGES.length);
Player player = event.getEntity();
if (event.getDamageSource().getDamageType() == DamageType.FALL) {
event.setDeathMessage(FALL_MESSAGES[randomIndex].replace("%p", player.getName()));
}
}
}
@@ -1,13 +1,10 @@
package dev.zxq5.fantasysmp.warps; package dev.zxq5.fantasysmp.warps;
import dev.zxq5.fantasysmp.chatutils.Chat; import dev.zxq5.fantasysmp.chatutils.Chat;
import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import static dev.zxq5.fantasysmp.chatutils.Chat.EVENTPREFIX;
/* /*
* Commands: * Commands:
* *