From e572fc3daededcd4f3d34053926e156b5e73a7b0 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Tue, 3 Jul 2018 01:28:38 +0200 Subject: [PATCH] Remove obsolete class methods in ArenaMaster. Following the removal of set/remove class commands in 51b4b25094d866b658aae69fd7b8c60bc8ef7cba, these methods are now obsolete. --- .../garbagemule/MobArena/ArenaMasterImpl.java | 53 ------------------- .../MobArena/framework/ArenaMaster.java | 4 -- 2 files changed, 57 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java index 58db32d..59fe268 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java @@ -3,11 +3,9 @@ package com.garbagemule.MobArena; import static com.garbagemule.MobArena.util.config.ConfigUtils.makeSection; import static com.garbagemule.MobArena.util.config.ConfigUtils.parseLocation; -import com.garbagemule.MobArena.ArenaClass.ArmorType; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.framework.ArenaMaster; import com.garbagemule.MobArena.things.Thing; -import com.garbagemule.MobArena.util.ItemParser; import com.garbagemule.MobArena.util.config.ConfigUtils; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -16,8 +14,6 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; import java.util.ArrayList; import java.util.Arrays; @@ -439,55 +435,6 @@ public class ArenaMasterImpl implements ArenaMaster .forEach(arenaClass::addLobbyPermission); } - public ArenaClass createClassNode(String classname, PlayerInventory inv, boolean safe) { - String path = "classes." + classname; - if (safe && config.getConfigurationSection(path) != null) { - return null; - } - - // Create the node. - config.set(path, ""); - - // Grab the section, create if missing - ConfigurationSection section = config.getConfigurationSection(path); - if (section == null) section = config.createSection(path); - - // Take the current items and armor. - section.set("items", ItemParser.parseString(inv.getContents())); - section.set("armor", ItemParser.parseString(inv.getArmorContents())); - - // If the helmet isn't a real helmet, set it explicitly. - ItemStack helmet = inv.getHelmet(); - if (helmet != null && ArmorType.getType(helmet) != ArmorType.HELMET) { - section.set("helmet", ItemParser.parseString(helmet)); - } - - // Include the off-hand - ItemStack offhand = inv.getItemInOffHand(); - if (offhand != null) { - section.set("offhand", ItemParser.parseString(offhand)); - } - - // Save changes. - plugin.saveConfig(); - - // Load the class - return loadClass(classname); - } - - public void removeClassNode(String classname) { - String lowercase = classname.toLowerCase(); - if (!classes.containsKey(lowercase)) - throw new IllegalArgumentException("Class does not exist!"); - - // Remove the class from the config-file and save it. - config.set("classes." + classname, null); - plugin.saveConfig(); - - // Remove the class from the map. - classes.remove(lowercase); - } - /** * Load all arena-related stuff. */ diff --git a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java index 890408d..7ec9105 100644 --- a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java +++ b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java @@ -107,10 +107,6 @@ public interface ArenaMaster */ void loadClasses(); - ArenaClass createClassNode(String className, PlayerInventory inv, boolean safe); - - void removeClassNode(String className); - /** * Load all arena-related stuff. */