mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-14 21:22:09 +00:00
cleanup
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1591 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
parent
198607d425
commit
710088fb13
1 changed files with 6 additions and 11 deletions
|
@ -45,10 +45,6 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
public static final int minBukkitBuildVersion = 818;
|
public static final int minBukkitBuildVersion = 818;
|
||||||
private static final Logger logger = Logger.getLogger("Minecraft");
|
private static final Logger logger = Logger.getLogger("Minecraft");
|
||||||
private Settings settings;
|
private Settings settings;
|
||||||
private EssentialsPlayerListener playerListener;
|
|
||||||
private EssentialsBlockListener blockListener;
|
|
||||||
private EssentialsEntityListener entityListener;
|
|
||||||
private JailPlayerListener jailPlayerListener;
|
|
||||||
private TNTExplodeListener tntListener;
|
private TNTExplodeListener tntListener;
|
||||||
private EssentialsDependancyChecker essDep;
|
private EssentialsDependancyChecker essDep;
|
||||||
private static Essentials instance = null;
|
private static Essentials instance = null;
|
||||||
|
@ -61,7 +57,6 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
public ArrayList bannedIps = new ArrayList();
|
public ArrayList bannedIps = new ArrayList();
|
||||||
private Backup backup;
|
private Backup backup;
|
||||||
private final Map<String, User> users = new HashMap<String, User>();
|
private final Map<String, User> users = new HashMap<String, User>();
|
||||||
private EssentialsTimer timer;
|
|
||||||
private EssentialsUpdateTimer updateTimer;
|
private EssentialsUpdateTimer updateTimer;
|
||||||
private boolean registerFallback = true;
|
private boolean registerFallback = true;
|
||||||
private final Methods paymentMethod = new Methods();
|
private final Methods paymentMethod = new Methods();
|
||||||
|
@ -145,11 +140,11 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ServerListener serverListener = new EssentialsPluginListener(paymentMethod);
|
final ServerListener serverListener = new EssentialsPluginListener(paymentMethod);
|
||||||
pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
|
pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
|
||||||
pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
|
pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
|
||||||
|
|
||||||
playerListener = new EssentialsPlayerListener(this);
|
final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
|
||||||
pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
|
pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
|
||||||
pm.registerEvent(Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
|
pm.registerEvent(Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
|
||||||
pm.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Lowest, this);
|
pm.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Lowest, this);
|
||||||
|
@ -164,18 +159,18 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
pm.registerEvent(Type.PLAYER_BUCKET_EMPTY, playerListener, Priority.High, this);
|
pm.registerEvent(Type.PLAYER_BUCKET_EMPTY, playerListener, Priority.High, this);
|
||||||
pm.registerEvent(Type.PLAYER_ANIMATION, playerListener, Priority.High, this);
|
pm.registerEvent(Type.PLAYER_ANIMATION, playerListener, Priority.High, this);
|
||||||
|
|
||||||
blockListener = new EssentialsBlockListener(this);
|
final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
|
||||||
pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Low, this);
|
pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Low, this);
|
||||||
pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Lowest, this);
|
pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Lowest, this);
|
||||||
pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
|
pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
|
||||||
|
|
||||||
entityListener = new EssentialsEntityListener(this);
|
final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
|
||||||
pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
|
pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
|
||||||
pm.registerEvent(Type.ENTITY_COMBUST, entityListener, Priority.Lowest, this);
|
pm.registerEvent(Type.ENTITY_COMBUST, entityListener, Priority.Lowest, this);
|
||||||
pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this);
|
pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this);
|
||||||
|
|
||||||
jail = new Jail(this);
|
jail = new Jail(this);
|
||||||
jailPlayerListener = new JailPlayerListener(this);
|
final JailPlayerListener jailPlayerListener = new JailPlayerListener(this);
|
||||||
confList.add(jail);
|
confList.add(jail);
|
||||||
pm.registerEvent(Type.BLOCK_BREAK, jail, Priority.High, this);
|
pm.registerEvent(Type.BLOCK_BREAK, jail, Priority.High, this);
|
||||||
pm.registerEvent(Type.BLOCK_DAMAGE, jail, Priority.High, this);
|
pm.registerEvent(Type.BLOCK_DAMAGE, jail, Priority.High, this);
|
||||||
|
@ -191,7 +186,7 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
tntListener = new TNTExplodeListener(this);
|
tntListener = new TNTExplodeListener(this);
|
||||||
pm.registerEvent(Type.ENTITY_EXPLODE, tntListener, Priority.High, this);
|
pm.registerEvent(Type.ENTITY_EXPLODE, tntListener, Priority.High, this);
|
||||||
|
|
||||||
timer = new EssentialsTimer(this);
|
final EssentialsTimer timer = new EssentialsTimer(this);
|
||||||
getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 50);
|
getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 50);
|
||||||
if (enableErrorLogging)
|
if (enableErrorLogging)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue