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 --- .../geoip/EssentialsGeoIPPlayerListener.java | 3 ++- .../essentials/protect/EssentialsProtect.java | 26 +++++++++++----------- .../protect/EssentialsProtectBlockListener.java | 1 - .../earth2me/essentials/spawn/Commandsetspawn.java | 6 +++-- .../earth2me/essentials/spawn/Commandspawn.java | 6 +++-- .../spawn/EssentialsSpawnPlayerListener.java | 17 ++++++++------ 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java index 91d0186e6..a9dd9ad3d 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.geoip; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.EssentialsConf; import com.earth2me.essentials.IConf; +import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import com.maxmind.geoip.Location; @@ -44,7 +45,7 @@ public class EssentialsGeoIPPlayerListener extends PlayerListener implements ICo @Override public void onPlayerJoin(PlayerJoinEvent event) { - Essentials ess = Essentials.getStatic(); + IEssentials ess = Essentials.getStatic(); User u = ess.getUser(event.getPlayer()); if (u.isAuthorized("essentials.geoip.hide")) { 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; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java index a19fa3d9a..4f997a14e 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.spawn; import org.bukkit.Server; import com.earth2me.essentials.Essentials; +import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import com.earth2me.essentials.commands.EssentialsCommand; @@ -17,9 +18,10 @@ public class Commandsetspawn extends EssentialsCommand @Override public void run(Server server, User user, String commandLabel, String[] args) throws Exception { + final IEssentials ess = Essentials.getStatic(); charge(user); - String group = args.length > 0 ? getFinalArg(args, 0) : "default"; - Essentials.getSpawn().setSpawn(user.getLocation(), group); + final String group = args.length > 0 ? getFinalArg(args, 0) : "default"; + ess.getSpawn().setSpawn(user.getLocation(), group); user.sendMessage(Util.format("spawnSet", group)); } } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java index f36b284e3..88a7c477b 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.spawn; import com.earth2me.essentials.Charge; import org.bukkit.Server; import com.earth2me.essentials.Essentials; +import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import com.earth2me.essentials.commands.EssentialsCommand; @@ -17,8 +18,9 @@ public class Commandspawn extends EssentialsCommand @Override public void run(Server server, User user, String commandLabel, String[] args) throws Exception { - Charge charge = new Charge(this); + final IEssentials ess = Essentials.getStatic(); + final Charge charge = new Charge(this.getName(), ess); charge.isAffordableFor(user); - user.getTeleport().respawn(Essentials.getSpawn(), charge); + user.getTeleport().respawn(ess.getSpawn(), charge); } } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index ace8cd50b..e1e804e58 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -1,6 +1,7 @@ package com.earth2me.essentials.spawn; import com.earth2me.essentials.Essentials; +import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.logging.Level; @@ -16,11 +17,12 @@ public class EssentialsSpawnPlayerListener extends PlayerListener @Override public void onPlayerRespawn(PlayerRespawnEvent event) { - User user = Essentials.getStatic().getUser(event.getPlayer()); + final IEssentials ess = Essentials.getStatic(); + final User user = ess.getUser(event.getPlayer()); try { - if (Essentials.getStatic().getSettings().getRespawnAtHome()) + if (ess.getSettings().getRespawnAtHome()) { Location home = user.getHome(user.getLocation()); if (home == null) { @@ -33,7 +35,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener catch (Throwable ex) { } - Location spawn = Essentials.getSpawn().getSpawn(user.getGroup()); + Location spawn = ess.getSpawn().getSpawn(user.getGroup()); if (spawn == null) { return; } @@ -43,7 +45,8 @@ public class EssentialsSpawnPlayerListener extends PlayerListener @Override public void onPlayerJoin(PlayerJoinEvent event) { - User user = Essentials.getStatic().getUser(event.getPlayer()); + final IEssentials ess = Essentials.getStatic(); + final User user = ess.getUser(event.getPlayer()); if (!user.isNew()) { @@ -51,14 +54,14 @@ public class EssentialsSpawnPlayerListener extends PlayerListener } user.setNew(false); try { - user.getTeleport().now(Essentials.getSpawn().getSpawn(Essentials.getStatic().getSettings().getNewbieSpawn())); + user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn())); } catch (Exception ex) { Logger.getLogger("Minecraft").log(Level.WARNING, Util.i18n("teleportNewPlayerError"), ex); } - if (Essentials.getStatic().getSettings().getAnnounceNewPlayers()) + if (ess.getSettings().getAnnounceNewPlayers()) { - Essentials.getStatic().broadcastMessage(user.getName(), Essentials.getStatic().getSettings().getAnnounceNewPlayerFormat(user)); + ess.broadcastMessage(user.getName(), ess.getSettings().getAnnounceNewPlayerFormat(user)); } } } -- cgit v1.2.3