From 8f17e9fbb7ef384675b2a990933bd3ba37bc6a5d Mon Sep 17 00:00:00 2001
From: Matheus <matheus.alvino2009@gmail.com>
Date: Fri, 26 Apr 2024 22:06:22 -0400
Subject: [PATCH] too lazy to write this #2

---
 src/main/java/dev/lugami/otaku/commands/FFACommand.java       | 1 +
 src/main/java/dev/lugami/otaku/commands/FFAJoinCommand.java   | 3 +--
 .../java/dev/lugami/otaku/essentials/EssentialsListener.java  | 4 +---
 src/main/java/dev/lugami/otaku/listener/FFAListener.java      | 2 ++
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/dev/lugami/otaku/commands/FFACommand.java b/src/main/java/dev/lugami/otaku/commands/FFACommand.java
index 1767785..5f143c0 100644
--- a/src/main/java/dev/lugami/otaku/commands/FFACommand.java
+++ b/src/main/java/dev/lugami/otaku/commands/FFACommand.java
@@ -11,6 +11,7 @@ public class FFACommand {
     public void execute(Player player) {
         for (String s : Main.getInstance().getLangConfig().getStringList("COMMANDS.FFA.LINES")) {
             if (s.contains("<admin>")) {
+                if (!player.hasPermission("otaku.admin")) continue;
                 for (String z : Main.getInstance().getLangConfig().getStringList("COMMANDS.FFA.ADMIN-ADDITION")) {
                     player.sendMessage(CC.translate(z));
                 }
diff --git a/src/main/java/dev/lugami/otaku/commands/FFAJoinCommand.java b/src/main/java/dev/lugami/otaku/commands/FFAJoinCommand.java
index 656b8e9..01b4dce 100644
--- a/src/main/java/dev/lugami/otaku/commands/FFAJoinCommand.java
+++ b/src/main/java/dev/lugami/otaku/commands/FFAJoinCommand.java
@@ -7,7 +7,6 @@ import dev.lugami.otaku.events.FFAJoinEvent;
 import dev.lugami.otaku.kit.Kit;
 import dev.lugami.otaku.profile.Profile;
 import dev.lugami.otaku.profile.data.ProfileState;
-import dev.lugami.otaku.utils.CC;
 import org.bukkit.entity.Player;
 
 @CommandMeta(label = {"ffa join", "ffa enter"})
@@ -15,7 +14,7 @@ public class FFAJoinCommand {
 
     public void execute(Player player, @CPL("kit") String kit) {
         if (Kit.getByName(kit) == null) {
-            player.sendMessage(CC.RED + "A kit with that name does not exist.");
+            player.sendMessage(Language.KIT_DOESNT_EXIST.format());
             return;
         }
         if (Profile.getOrCreate(player).getState() != ProfileState.PLAYING) {
diff --git a/src/main/java/dev/lugami/otaku/essentials/EssentialsListener.java b/src/main/java/dev/lugami/otaku/essentials/EssentialsListener.java
index 6be5564..8eb068d 100644
--- a/src/main/java/dev/lugami/otaku/essentials/EssentialsListener.java
+++ b/src/main/java/dev/lugami/otaku/essentials/EssentialsListener.java
@@ -8,7 +8,6 @@ import dev.lugami.otaku.profile.Profile;
 import dev.lugami.otaku.profile.data.ProfileState;
 import dev.lugami.otaku.utils.CC;
 import org.bukkit.GameMode;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -108,8 +107,7 @@ public class EssentialsListener implements Listener {
 				if (kit.getKitRules().isNoDamage()) {
 					event.setDamage(0.0);
 				} else if (event.getCause() == EntityDamageEvent.DamageCause.VOID) {
-					CraftPlayer player = ((CraftPlayer) event.getEntity());
-					new FFADeathEvent(player, new ArrayList<>()).call();
+					new FFADeathEvent((Player) event.getEntity(), new ArrayList<>()).call();
 				}
 			}
 		}
diff --git a/src/main/java/dev/lugami/otaku/listener/FFAListener.java b/src/main/java/dev/lugami/otaku/listener/FFAListener.java
index 6c0b6d8..9977b35 100644
--- a/src/main/java/dev/lugami/otaku/listener/FFAListener.java
+++ b/src/main/java/dev/lugami/otaku/listener/FFAListener.java
@@ -85,6 +85,7 @@ public class FFAListener implements Listener {
             //event.getPlayer().sendMessage(CC.RED + "You're still in combat!" + CC.GRAY + " (Remaining: " + Main.getInstance().getCombatManager().getCombatTime(event.getPlayer()) + "s)");
         } else {
             FFACache.getFFAList().get(profile.getFFA()).remove(event.getPlayer());
+            if (Main.getInstance().getEnderpearlManager().isPearlCooldown(event.getPlayer())) Main.getInstance().getEnderpearlManager().setPearlCooldown(event.getPlayer(), false);
             if (Hotbar.setup(event.getPlayer()) && Main.getInstance().getEssentials().getSpawn() != null) {
                 Main.getInstance().getEssentials().teleportToSpawn(event.getPlayer());
                 Main.getInstance().getServer().getLogger().info("Player " + event.getPlayer().getName() + " was setupped correctly!");
@@ -206,6 +207,7 @@ public class FFAListener implements Listener {
     @EventHandler
     public void onDamage(EntityDamageEvent event) {
         if (event.getEntity() instanceof Player) {
+            if (Profile.getOrCreate((Player) event.getEntity()).getState() != ProfileState.PLAYING) return;
             if (Profile.getOrCreate((Player) event.getEntity()).getFFA().getKitRules().isNoDamage()) {
                 event.setDamage(0.0);
                 return;