From c9b0f85bee78b4e80268300ce989877dccfd4da1 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Thu, 9 Apr 2020 11:31:46 +0200 Subject: [PATCH] Remove unused fields, imports, warning suppressions. Just a bit of spring cleaning! --- .../java/com/garbagemule/MobArena/ArenaImpl.java | 1 - .../java/com/garbagemule/MobArena/MobArena.java | 4 ---- .../com/garbagemule/MobArena/RewardManager.java | 14 +------------- .../MobArena/util/config/ConfigUtils.java | 1 - 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java index c8afe26..0803263 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java @@ -859,7 +859,6 @@ public class ArenaImpl implements Arena } @Override - @SuppressWarnings("deprecation") public void revivePlayer(Player p) { removePermissionAttachments(p); removePotionEffects(p); diff --git a/src/main/java/com/garbagemule/MobArena/MobArena.java b/src/main/java/com/garbagemule/MobArena/MobArena.java index 2dc1ff2..4f437d9 100644 --- a/src/main/java/com/garbagemule/MobArena/MobArena.java +++ b/src/main/java/com/garbagemule/MobArena/MobArena.java @@ -264,10 +264,6 @@ public class MobArena extends JavaPlugin return lastFailureCause; } - public File getPluginFile() { - return getFile(); - } - @Override public FileConfiguration getConfig() { if (config == null) { diff --git a/src/main/java/com/garbagemule/MobArena/RewardManager.java b/src/main/java/com/garbagemule/MobArena/RewardManager.java index 699649b..60ee6b2 100644 --- a/src/main/java/com/garbagemule/MobArena/RewardManager.java +++ b/src/main/java/com/garbagemule/MobArena/RewardManager.java @@ -5,7 +5,6 @@ import com.garbagemule.MobArena.things.Thing; import org.bukkit.entity.Player; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -14,16 +13,10 @@ import java.util.Set; public class RewardManager { - @SuppressWarnings("unused") - private MobArena plugin; - @SuppressWarnings("unused") - private Arena arena; private Map> players; private Set rewarded; public RewardManager(Arena arena) { - this.plugin = arena.getPlugin(); - this.arena = arena; this.players = new HashMap<>(); this.rewarded = new HashSet<>(); } @@ -39,12 +32,7 @@ public class RewardManager } players.get(p).add(thing); } - - public List getRewards(Player p) { - List rewards = players.get(p); - return (rewards == null ? new ArrayList<>(1) : Collections.unmodifiableList(rewards)); - } - + public void grantRewards(Player p) { if (rewarded.contains(p)) return; diff --git a/src/main/java/com/garbagemule/MobArena/util/config/ConfigUtils.java b/src/main/java/com/garbagemule/MobArena/util/config/ConfigUtils.java index bcc965c..a8acff0 100644 --- a/src/main/java/com/garbagemule/MobArena/util/config/ConfigUtils.java +++ b/src/main/java/com/garbagemule/MobArena/util/config/ConfigUtils.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.util.config; -import com.garbagemule.MobArena.ConfigError; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World;