minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 11:37:30 +02:00
Code Issues Releases Wiki Activity

[trunk] Protect, merging changes in

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1581 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo
2011-06-03 20:56:29 +00:00
parent aef2dd35d6
commit 541fc51780
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
View File

@@ -12,6 +12,8 @@ import com.earth2me.essentials.protect.data.ProtectedBlockSQLite;
import java.beans.PropertyVetoException;
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;
@@ -30,16 +32,16 @@ public class EssentialsProtect extends JavaPlugin implements IConf
private EssentialsProtectWeatherListener weatherListener = 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 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<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;
private IProtectedBlock storage = null;
IEssentials ess = null;
private static EssentialsProtect instance = null;
@@ -54,8 +56,6 @@ public class EssentialsProtect extends JavaPlugin implements IConf
PluginManager pm = this.getServer().getPluginManager();
ess = Essentials.getStatic();
ess.getDependancyChecker().checkProtectDependancies();
instance = this;
reloadConfig();
playerListener = new EssentialsProtectPlayerListener(this);
blockListener = new EssentialsProtectBlockListener(this);
@@ -77,13 +77,15 @@ public class EssentialsProtect extends JavaPlugin implements IConf
if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion()))
{
logger.log(Level.WARNING, "Version mismatch! Please update all Essentials jars to the same version.");
reloadConfig();
Essentials.getStatic().addReloadListener(this);
}
logger.info("Loaded " + this.getDescription().getName() + " build " + this.getDescription().getVersion() + " maintained by " + AUTHORS);
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<Integer> itemList, int id)
{
return !itemList.isEmpty() && itemList.contains(String.valueOf(id));
return !itemList.isEmpty() && itemList.contains(id);
}
@Override