From ca21b92762917fdfd1fb5ec73707b0a97cf23be3 Mon Sep 17 00:00:00 2001
From: ementalo <ementalodev@gmx.co.uk>
Date: Mon, 18 Jun 2012 11:39:27 +0100
Subject: [PATCH] Fix /mute to follow same convention as /tjail

Fixed #2056
---
 Essentials/src/com/earth2me/essentials/api/IUser.java |  2 +-
 .../com/earth2me/essentials/commands/Commandmute.java | 11 ++++++++---
 .../essentials/listener/EssentialsBlockListener.java  |  2 +-
 .../essentials/listener/EssentialsPlayerListener.java |  2 +-
 Essentials/src/com/earth2me/essentials/user/User.java |  1 +
 .../src/com/earth2me/essentials/user/UserBase.java    |  8 +++-----
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/com/earth2me/essentials/api/IUser.java
index e18a4470e..6fc804d93 100644
--- a/Essentials/src/com/earth2me/essentials/api/IUser.java
+++ b/Essentials/src/com/earth2me/essentials/api/IUser.java
@@ -84,7 +84,7 @@ public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload,
 
 	void addMail(String string);
 
-	boolean toggleMuted();
+	void setMuted(boolean mute);
 
 	boolean toggleSocialSpy();
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
index b537c5a96..edf12f40f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
@@ -22,7 +22,7 @@ public class Commandmute extends EssentialsCommand
 
 		@Cleanup
 		final IUser player = getPlayer(args, 0, true);
-		player.acquireReadLock();
+		player.acquireReadLock(); 
 		if (!player.getData().isMuted() && Permissions.MUTE_EXEMPT.isAuthorized(player))
 		{
 			throw new Exception(_("muteExempt"));
@@ -30,11 +30,16 @@ public class Commandmute extends EssentialsCommand
 		long muteTimestamp = 0;
 		if (args.length > 1)
 		{
-			String time = getFinalArg(args, 1);
+			final String time = getFinalArg(args, 1);
 			muteTimestamp = DateUtil.parseDateDiff(time, true);
+			player.setMuted(true);
+		}
+		else
+		{
+			player.setMuted(!player.getData().isMuted());
 		}
 		player.setTimestamp(TimestampType.MUTE, muteTimestamp);
-		final boolean muted = player.toggleMuted();
+		final boolean muted = player.getData().isMuted();
 		sender.sendMessage(
 				muted
 				? (muteTimestamp > 0
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
index 3d09d39ff..49fff3de3 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
@@ -21,7 +21,7 @@ public class EssentialsBlockListener implements Listener
 		this.ess = ess;
 	}
 
-	@EventHandler(priority = EventPriority.Low, ignoreCancelled = true)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onBlockPlace(final BlockPlaceEvent event)
 	{
 		// Do not rely on getItemInHand();
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
index 6ff80e568..c9a73550a 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
@@ -129,7 +129,7 @@ public class EssentialsPlayerListener implements Listener
 		settings.acquireReadLock();
 		if (settings.getData().getCommands().getGod().isRemoveOnDisconnect() && user.isGodModeEnabled())
 		{
-			user.toggleGodModeEnabled();
+			user.setGodModeEnabled(false);
 		}
 		if (user.getData().getInventory() != null)
 		{
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java
index 82797ba8e..ba7cbc31c 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -408,6 +408,7 @@ public class User extends UserBase implements IUser
 	}
 
 	//Returns true if status expired during this check
+	@Override
 	public boolean checkMuteTimeout(final long currentTime)
 	{
 		acquireReadLock();
diff --git a/Essentials/src/com/earth2me/essentials/user/UserBase.java b/Essentials/src/com/earth2me/essentials/user/UserBase.java
index 5b444e962..d8f9f264b 100644
--- a/Essentials/src/com/earth2me/essentials/user/UserBase.java
+++ b/Essentials/src/com/earth2me/essentials/user/UserBase.java
@@ -285,14 +285,12 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
 		}
 	}
 
-	public boolean toggleMuted()
+	public void setMuted(boolean mute)
 	{
 		acquireWriteLock();
 		try
-		{
-			boolean ret = !getData().isMuted();
-			getData().setMuted(ret);
-			return ret;
+		{		
+			getData().setMuted(mute);		
 		}
 		finally
 		{