From 8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 1 Jun 2011 11:26:12 +0000 Subject: Missed some parts for the last commits git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1555 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../essentials/protect/EssentialsProtect.java | 26 +++++++++++----------- .../protect/EssentialsProtectBlockListener.java | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'EssentialsProtect') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index ceb668d83..b35a1346b 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -4,8 +4,8 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.IConf; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Location; @@ -25,16 +25,16 @@ public class EssentialsProtect extends JavaPlugin implements IConf private EssentialsProtectServerListener serverListener = null; public static final String AUTHORS = Essentials.AUTHORS; private static final Logger logger = Logger.getLogger("Minecraft"); - public static HashMap genSettings = null; - public static HashMap dataSettings = null; - public static HashMap guardSettings = null; - public static HashMap playerSettings = null; - public static ArrayList usageList = null; - public static ArrayList blackListPlace = null; - public static ArrayList breakBlackList = null; - public static ArrayList onPlaceAlert = null; - public static ArrayList onUseAlert = null; - public static ArrayList onBreakAlert = null; + public static Map genSettings = null; + public static Map dataSettings = null; + public static Map guardSettings = null; + public static Map playerSettings = null; + public static List usageList = null; + public static List blackListPlace = null; + public static List breakBlackList = null; + public static List onPlaceAlert = null; + public static List onUseAlert = null; + public static List onBreakAlert = null; public EssentialsProtect() { @@ -81,7 +81,7 @@ public class EssentialsProtect extends JavaPlugin implements IConf logger.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Essentials.AUTHORS)); } - public static boolean checkProtectionItems(ArrayList itemList, int id) + public static boolean checkProtectionItems(List itemList, int id) { return !itemList.isEmpty() && itemList.contains(id); } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index f256e185f..b32ac95a1 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -3,7 +3,6 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -- cgit v1.2.3