summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-28 14:05:50 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-28 14:05:50 +0000
commite960078e1ad87cd509e5b13eafd02e3ecb7136a7 (patch)
treeb5d1bf496214fb4b673232779eb40509a3638b6e
parentf4413633b8c1ad5dd888370158fe412fa00a66d3 (diff)
downloadEssentials-e960078e1ad87cd509e5b13eafd02e3ecb7136a7.tar
Essentials-e960078e1ad87cd509e5b13eafd02e3ecb7136a7.tar.gz
Essentials-e960078e1ad87cd509e5b13eafd02e3ecb7136a7.tar.lz
Essentials-e960078e1ad87cd509e5b13eafd02e3ecb7136a7.tar.xz
Essentials-e960078e1ad87cd509e5b13eafd02e3ecb7136a7.zip
Random Cleanup
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java1
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java1
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java1
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java1
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java2
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java2
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java24
7 files changed, 19 insertions, 13 deletions
diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
index 3a37f04b0..4b509206d 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
@@ -16,6 +16,7 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.config.Configuration;
+
@Deprecated
public class EssentialsConf extends Configuration
{
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
index e566de685..2eae385a9 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
@@ -80,7 +80,6 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable
ex.fillInStackTrace();
throw ex;
}
-
this.format = format;
}
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
index 639efd696..c7ce5a70d 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
@@ -28,7 +28,6 @@ public class EssentialsLocalChatEventListener implements Listener
@EventHandler(priority = EventPriority.HIGHEST)
public void onLocalChat(final EssentialsLocalChatEvent event)
{
-
final Player sender = event.getPlayer();
final Location loc = sender.getLocation();
final World world = loc.getWorld();
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
index 292ce3959..576c93e6f 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
@@ -28,7 +28,6 @@ public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer
{
return;
}
-
chargeChat(event, chatStore);
}
}
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
index 58edc2b0f..3fcff995c 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
@@ -28,11 +28,9 @@ public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer
{
return;
}
-
final IUser user = ess.getUser(event.getPlayer());
final ChatStore chatStore = new ChatStore(ess, user, getChatType(event.getMessage()));
setChatStore(event, chatStore);
-
formatChat(event, chatStore);
}
} \ No newline at end of file
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index 48a74557b..bab6bd822 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -104,7 +104,7 @@ public class EssentialsSpawnPlayerListener implements Listener
{
return;
}
-
+
try
{
final Location spawn = spawns.getNewbieSpawn();
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java
index 13eb1f7df..9f040518a 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java
@@ -98,12 +98,15 @@ public class SpawnStorage extends AsyncStorageObjectHolder<Spawns> implements IE
{
for (EventPriority priority : EventPriority.values())
{
- if (priority.toString().equalsIgnoreCase(getData().getRespawnPriority())) {
+ if (priority.toString().equalsIgnoreCase(getData().getRespawnPriority()))
+ {
return priority;
}
}
return EventPriority.NORMAL;
- } finally {
+ }
+ finally
+ {
unlock();
}
}
@@ -113,12 +116,15 @@ public class SpawnStorage extends AsyncStorageObjectHolder<Spawns> implements IE
acquireReadLock();
try
{
- if (getData().getNewbieSpawn() == null || getData().getNewbieSpawn().isEmpty() ||
- getData().getNewbieSpawn().equalsIgnoreCase("none")) {
+ if (getData().getNewbieSpawn() == null || getData().getNewbieSpawn().isEmpty()
+ || getData().getNewbieSpawn().equalsIgnoreCase("none"))
+ {
return null;
}
return getSpawn(getData().getNewbieSpawn());
- } finally {
+ }
+ finally
+ {
unlock();
}
}
@@ -129,7 +135,9 @@ public class SpawnStorage extends AsyncStorageObjectHolder<Spawns> implements IE
try
{
return getData().getNewPlayerAnnouncement() != null && !getData().getNewPlayerAnnouncement().isEmpty();
- } finally {
+ }
+ finally
+ {
unlock();
}
}
@@ -140,7 +148,9 @@ public class SpawnStorage extends AsyncStorageObjectHolder<Spawns> implements IE
try
{
return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", user.getGroup()).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
- } finally {
+ }
+ finally
+ {
unlock();
}
}