Fixed attack cooldown not restoring properly

Despical · Apr 30, 2024 · 96961bf · 96961bf
1 parent 850b047
commit 96961bf
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/src/main/java/me/despical/oitc/Main.java b/src/main/java/me/despical/oitc/Main.java
@@ -24,7 +24,6 @@
 import me.despical.oitc.handlers.language.LanguageManager;
 import org.bstats.bukkit.Metrics;
 import me.despical.commons.database.MysqlDatabase;
-import me.despical.commons.miscellaneous.AttributeUtils;
 import me.despical.commons.scoreboard.ScoreboardLib;
 import me.despical.commons.serializer.InventorySerializer;
 import me.despical.commons.util.Collections;
@@ -87,7 +86,8 @@ public void onDisable() {
 			arena.getScoreboardManager().stopAllScoreboards();
 
 			for (Player player : arena.getPlayers()) {
-				AttributeUtils.resetAttackCooldown(player);
+				User user = userManager.getUser(player);
+				user.resetAttackCooldown();
 
 				arena.teleportToEndLocation(player);
 				arena.doBarAction(0, player);

diff --git a/src/main/java/me/despical/oitc/arena/Arena.java b/src/main/java/me/despical/oitc/arena/Arena.java
@@ -438,7 +438,6 @@ public void run() {
 
 				for (Player player : players) {
 					ArenaUtils.showPlayersOutsideTheGame(player, this);
-					AttributeUtils.resetAttackCooldown(player);
 
 					for (final User users : plugin.getUserManager().getUsers()) {
 						final Player usersPlayer = users.getPlayer();
@@ -465,6 +464,7 @@ public void run() {
 					doBarAction(0, player);
 
 					User user = plugin.getUserManager().getUser(player);
+					user.resetAttackCooldown();
 					user.performReward(Reward.RewardType.END_GAME);
 					user.removeScoreboard();
 				}

diff --git a/src/main/java/me/despical/oitc/arena/ArenaManager.java b/src/main/java/me/despical/oitc/arena/ArenaManager.java
@@ -140,6 +140,7 @@ public static void joinAttempt(Player player, Arena arena) {
 		user.addGameItem("leave-item");
 		user.resetStats();
 		user.heal();
+		user.updateAttackCooldown();
 
 		if (arena.isArenaState(ArenaState.WAITING_FOR_PLAYERS, ArenaState.STARTING) && player.isOp()) {
 			user.addGameItem("force-start-item");
@@ -159,7 +160,9 @@ public static void joinAttempt(Player player, Arena arena) {
 
 			ArenaUtils.hidePlayer(player, arena);
 
-			if (ArenaUtils.shouldHide()) {
+			hide_player: {
+				if (!ArenaUtils.shouldHide()) break hide_player;
+
 				for (Player spectator : arena.getPlayers()) {
 					if (plugin.getUserManager().getUser(spectator).isSpectator()) {
 						PlayerUtils.hidePlayer(player, spectator, plugin);
@@ -172,8 +175,6 @@ public static void joinAttempt(Player player, Arena arena) {
 			return;
 		}
 
-		AttributeUtils.setAttackCooldown(player, plugin.getConfig().getDouble("Hit-Cooldown-Delay", 4));
-
 		arena.teleportToLobby(player);
 		arena.doBarAction(1, player);
 		arena.showPlayers();
@@ -215,9 +216,8 @@ public static void leaveAttempt(Player player, Arena arena, boolean quit) {
 
 		chatManager.broadcastAction(arena, user, ActionType.LEAVE);
 
-		AttributeUtils.resetAttackCooldown(player);
-
 		user.heal();
+		user.resetAttackCooldown();
 		user.setSpectator(false);
 		arena.getScoreboardManager().removeScoreboard(player);
 		arena.doBarAction(0, player);

diff --git a/src/main/java/me/despical/oitc/user/User.java b/src/main/java/me/despical/oitc/user/User.java
@@ -18,6 +18,7 @@
 
 package me.despical.oitc.user;
 
+import me.despical.commons.ReflectionUtils;
 import me.despical.commons.compat.Titles;
 import me.despical.commons.miscellaneous.AttributeUtils;
 import me.despical.oitc.ConfigPreferences;
@@ -27,12 +28,14 @@
 import me.despical.oitc.arena.Arena;
 import me.despical.oitc.handlers.items.GameItem;
 import me.despical.oitc.handlers.rewards.Reward;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scoreboard.Scoreboard;
 
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -49,6 +52,7 @@ public class User {
 	private final Map<StatsStorage.StatisticType, Integer> stats;
 
 	private boolean spectator;
+	private double attackCooldown;
 	private Scoreboard cachedScoreboard;
 
 	public User(Player player) {
@@ -144,4 +148,28 @@ public void removeScoreboard() {
 	public void sendTitle(String title, String subTitle) {
 		Titles.sendTitle(this.getPlayer(), 10, 40, 10, title, subTitle);
 	}
+
+	public void updateAttackCooldown() {
+		if (!ReflectionUtils.supports(9)) return;
+
+		Player player = this.getPlayer();
+
+		if (player == null) return;
+
+		Optional.ofNullable(player.getAttribute(Attribute.GENERIC_ATTACK_SPEED)).ifPresent(attribute -> {
+			this.attackCooldown = attribute.getBaseValue();
+
+			attribute.setBaseValue(plugin.getConfig().getDouble("Hit-Cooldown-Delay", 4));
+		});
+	}
+
+	public void resetAttackCooldown() {
+		if (!ReflectionUtils.supports(9)) return;
+
+		Player player = this.getPlayer();
+
+		if (player == null) return;
+
+		Optional.ofNullable(player.getAttribute(Attribute.GENERIC_ATTACK_SPEED)).ifPresent(attribute -> attribute.setBaseValue(this.attackCooldown));
+	}
 }