summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src/com/earth2me
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-06-01 11:26:12 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-06-01 11:26:12 +0000
commit8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8 (patch)
tree97220ed88976602b742774e8f689ab3897067c58 /EssentialsProtect/src/com/earth2me
parent86e40db6b9babfae520b61c5fc43c27e55ac8a0a (diff)
downloadEssentials-8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8.tar
Essentials-8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8.tar.gz
Essentials-8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8.tar.lz
Essentials-8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8.tar.xz
Essentials-8e151357ce4f1bb4c5edb6d41e66e4d1a23798d8.zip
Missed some parts for the last commits
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1555 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsProtect/src/com/earth2me')
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java26
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java1
2 files changed, 13 insertions, 14 deletions
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<String, Boolean> genSettings = null;
- public static HashMap<String, String> dataSettings = null;
- public static HashMap<String, Boolean> guardSettings = null;
- public static HashMap<String, Boolean> playerSettings = null;
- public static ArrayList<Integer> usageList = null;
- public static ArrayList<Integer> blackListPlace = null;
- public static ArrayList<Integer> breakBlackList = null;
- public static ArrayList<Integer> onPlaceAlert = null;
- public static ArrayList<Integer> onUseAlert = null;
- public static ArrayList<Integer> onBreakAlert = null;
+ public static Map<String, Boolean> genSettings = null;
+ public static Map<String, String> dataSettings = null;
+ public static Map<String, Boolean> guardSettings = null;
+ public static Map<String, Boolean> playerSettings = null;
+ public static List<Integer> usageList = null;
+ public static List<Integer> blackListPlace = null;
+ public static List<Integer> breakBlackList = null;
+ public static List<Integer> onPlaceAlert = null;
+ public static List<Integer> onUseAlert = null;
+ public static List<Integer> 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<Integer> itemList, int id)
+ public static boolean checkProtectionItems(List<Integer> 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;