summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZenexer <Zenexer@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-03-31 12:05:42 +0000
committerZenexer <Zenexer@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-03-31 12:05:42 +0000
commit6e9561764f5aa138f689728d3b9f62e5bc6219f2 (patch)
tree8e92cba93f8d4b026ad4abe0058ba62cdaa3a01b
parentfcf67d18b7c74a951a471ea89b32453073ed4484 (diff)
downloadEssentials-6e9561764f5aa138f689728d3b9f62e5bc6219f2.tar
Essentials-6e9561764f5aa138f689728d3b9f62e5bc6219f2.tar.gz
Essentials-6e9561764f5aa138f689728d3b9f62e5bc6219f2.tar.lz
Essentials-6e9561764f5aa138f689728d3b9f62e5bc6219f2.tar.xz
Essentials-6e9561764f5aa138f689728d3b9f62e5bc6219f2.zip
Fixed priorities
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1046 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java20
2 files changed, 14 insertions, 12 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 376a968f6..fcff73594 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -163,9 +163,9 @@ public class Essentials extends JavaPlugin
pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.High, this);
blockListener = new EssentialsBlockListener(this);
- pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Monitor, this);
- pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Monitor, this);
- pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Monitor, this);
+ pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Low, this);
+ pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Lowest, this);
+ pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
entityListener = new EssentialsEntityListener(this);
pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index 6a39a1f07..91a22f0e1 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -47,6 +47,7 @@ public class EssentialsBlockListener extends BlockListener
user.sendMessage("§cYou do not have permission to destroy that sign.");
}
}
+
@Override
public void onSignChange(SignChangeEvent event)
{
@@ -77,8 +78,10 @@ public class EssentialsBlockListener extends BlockListener
if (event.getLine(0).equalsIgnoreCase("[Heal]"))
{
event.setLine(0, "§4[Heal]");
- if (user.isAuthorized("essentials.signs.heal.create")) {
- if (!event.getLine(1).isEmpty()) {
+ if (user.isAuthorized("essentials.signs.heal.create"))
+ {
+ if (!event.getLine(1).isEmpty())
+ {
String[] l1 = event.getLine(1).split("[ :-]+");
boolean m1 = l1[0].matches("\\$[0-9]+");
int q1 = Integer.parseInt(m1 ? l1[0].substring(1) : l1[0]);
@@ -101,7 +104,6 @@ public class EssentialsBlockListener extends BlockListener
if (event.getLine(0).equalsIgnoreCase("[Mail]"))
{
if (user.isAuthorized("essentials.signs.mail.create"))
-
event.setLine(0, "§1[Mail]");
else
event.setLine(0, "§4[Mail]");
@@ -110,7 +112,6 @@ public class EssentialsBlockListener extends BlockListener
if (event.getLine(0).equalsIgnoreCase("[Balance]"))
{
if (user.isAuthorized("essentials.signs.balance.create"))
-
event.setLine(0, "§1[Balance]");
else
event.setLine(0, "§4[Balance]");
@@ -124,18 +125,19 @@ public class EssentialsBlockListener extends BlockListener
}
@Override
- public void onBlockPlace(BlockPlaceEvent event) {
+ public void onBlockPlace(BlockPlaceEvent event)
+ {
Block signBlock = event.getBlockAgainst();
- if (signBlock.getType() == Material.WALL_SIGN || signBlock.getType() == Material.SIGN_POST) {
+ if (signBlock.getType() == Material.WALL_SIGN || signBlock.getType() == Material.SIGN_POST)
+ {
Sign sign = new CraftSign(signBlock);
- if (sign.getLine(0).matches("§1\\[[a-zA-Z]+\\]")) {
+ if (sign.getLine(0).matches("§1\\[[a-zA-Z]+\\]"))
+ {
event.setCancelled(true);
return;
}
}
}
-
-
public boolean hasAdjacentChest(Block block)
{