From 199e1efae5cde06cdcb1f2493d58820cd194ddec Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 19 May 2020 23:43:47 +0200 Subject: [PATCH] feat: disable friendly fire in Teams --- .../src/main/java/de/cliffbreak/varo/managers/TeamManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java b/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java index ff74159..7996d84 100644 --- a/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java +++ b/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java @@ -62,6 +62,7 @@ public class TeamManager { this.teams.add(team); this.teams.add(afkTeam); team.setPrefix(ChatColor.valueOf((String) jsonTeam.get("color")) + "§l[" + jsonTeam.get("prefix") + "] "); + team.setAllowFriendlyFire(false); afkTeam.setPrefix("§8§l[AFK] "); team.setColor(ChatColor.WHITE); afkTeam.setColor(ChatColor.valueOf((String) jsonTeam.get("color"))); @@ -78,7 +79,7 @@ public class TeamManager { final JSONObject player = (JSONObject) rawPlayer; try { final String result = WebUtils - .GET("https://sessionserver.mojang.com/session/minecraft/profile/" + player.get("uuid")); + .GET("https://sessionserver.mojang.com/session/minecraft/profile/" + player.get("uuid")); // TODO Async if (result.isEmpty()) { continue; }