From a4254a94f40eb2f2ec6c70f383f67926cd090e21 Mon Sep 17 00:00:00 2001
From: zxq5 <zxq5@zxq5.dev>
Date: Fri, 29 Aug 2025 00:46:27 +0100
Subject: [PATCH] added funny death messages

---
 .../java/dev/zxq5/fantasysmp/Fantasysmp.java  |  6 ++--
 .../dev/zxq5/fantasysmp/chatutils/Chat.java   | 10 +++---
 .../events/DeathMessageCustomiser.java        | 33 +++++++++++++++++++
 .../dev/zxq5/fantasysmp/warps/Warper.java     |  3 --
 4 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java

diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java
index 5c0bb37..9165d25 100644
--- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java
+++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java
@@ -1,9 +1,6 @@
 package dev.zxq5.fantasysmp;
 
-import dev.zxq5.fantasysmp.events.Chat;
-import dev.zxq5.fantasysmp.events.HereticWarner;
-import dev.zxq5.fantasysmp.events.StevenKillCheck;
-import dev.zxq5.fantasysmp.events.XrayDetector;
+import dev.zxq5.fantasysmp.events.*;
 import dev.zxq5.fantasysmp.groups.Commands;
 import dev.zxq5.fantasysmp.groups.Team;
 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 StevenKillCheck(), this);
+        getServer().getPluginManager().registerEvents(new DeathMessageCustomiser(), this);
 
         HereticWarner hereticWarner = new HereticWarner();
         hereticWarner.checkHereticInventory();
diff --git a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java
index 686be77..4c1a298 100644
--- a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java
+++ b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java
@@ -4,17 +4,19 @@ import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 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) {
-        player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message);
+        player.sendMessage(EVENT_PREFIX + ChatColor.GREEN + 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) {
-        player.sendMessage(EVENTPREFIX + message);
+        player.sendMessage(EVENT_PREFIX + message);
     }
 }
diff --git a/src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java b/src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java
new file mode 100644
index 0000000..ea6f3d0
--- /dev/null
+++ b/src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java
@@ -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()));
+        }
+    }
+}
diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java
index 61ec411..7bb290c 100644
--- a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java
+++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java
@@ -1,13 +1,10 @@
 package dev.zxq5.fantasysmp.warps;
 
 import dev.zxq5.fantasysmp.chatutils.Chat;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.entity.Player;
 
-import static dev.zxq5.fantasysmp.chatutils.Chat.EVENTPREFIX;
-
 /*
 * Commands:
 *