minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-26 07:54:41 +02:00
Code Issues Releases Wiki Activity

Fix /mute to follow same convention as /tjail

Browse Source 
Fixed #2056
This commit is contained in:
ementalo
2012-06-18 11:39:27 +01:00
parent 962d49517b
commit ca21b92762
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/api/IUser.java
View File

@@ -84,7 +84,7 @@ public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload,
void addMail(String string); void addMail(String string);
boolean toggleMuted(); void setMuted(boolean mute);
boolean toggleSocialSpy(); boolean toggleSocialSpy();

11
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View File

@@ -22,7 +22,7 @@ public class Commandmute extends EssentialsCommand
@Cleanup @Cleanup
final IUser player = getPlayer(args, 0, true); final IUser player = getPlayer(args, 0, true);
player.acquireReadLock(); player.acquireReadLock();
if (!player.getData().isMuted() && Permissions.MUTE_EXEMPT.isAuthorized(player)) if (!player.getData().isMuted() && Permissions.MUTE_EXEMPT.isAuthorized(player))
{ {
throw new Exception(_("muteExempt")); throw new Exception(_("muteExempt"));
@@ -30,11 +30,16 @@ public class Commandmute extends EssentialsCommand
long muteTimestamp = 0; long muteTimestamp = 0;
if (args.length > 1) if (args.length > 1)
{ {
String time = getFinalArg(args, 1); final String time = getFinalArg(args, 1);
muteTimestamp = DateUtil.parseDateDiff(time, true); muteTimestamp = DateUtil.parseDateDiff(time, true);
player.setMuted(true);
}
else
{
player.setMuted(!player.getData().isMuted());
} }
player.setTimestamp(TimestampType.MUTE, muteTimestamp); player.setTimestamp(TimestampType.MUTE, muteTimestamp);
final boolean muted = player.toggleMuted(); final boolean muted = player.getData().isMuted();
sender.sendMessage( sender.sendMessage(
muted muted
? (muteTimestamp > 0 ? (muteTimestamp > 0

2
Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
View File

@@ -21,7 +21,7 @@ public class EssentialsBlockListener implements Listener
this.ess = ess; this.ess = ess;
} }
@EventHandler(priority = EventPriority.Low, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockPlace(final BlockPlaceEvent event) public void onBlockPlace(final BlockPlaceEvent event)
{ {
// Do not rely on getItemInHand(); // Do not rely on getItemInHand();

2
Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
View File

@@ -129,7 +129,7 @@ public class EssentialsPlayerListener implements Listener
settings.acquireReadLock(); settings.acquireReadLock();
if (settings.getData().getCommands().getGod().isRemoveOnDisconnect() && user.isGodModeEnabled()) if (settings.getData().getCommands().getGod().isRemoveOnDisconnect() && user.isGodModeEnabled())
{ {
user.toggleGodModeEnabled(); user.setGodModeEnabled(false);
} }
if (user.getData().getInventory() != null) if (user.getData().getInventory() != null)
{ {

1
Essentials/src/com/earth2me/essentials/user/User.java
View File

@@ -408,6 +408,7 @@ public class User extends UserBase implements IUser
} }
//Returns true if status expired during this check //Returns true if status expired during this check
@Override
public boolean checkMuteTimeout(final long currentTime) public boolean checkMuteTimeout(final long currentTime)
{ {
acquireReadLock(); acquireReadLock();

8
Essentials/src/com/earth2me/essentials/user/UserBase.java
View File

@@ -285,14 +285,12 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
} }
} }
public boolean toggleMuted() public void setMuted(boolean mute)
{ {
acquireWriteLock(); acquireWriteLock();
try try
{ {
boolean ret = !getData().isMuted(); getData().setMuted(mute);
getData().setMuted(ret);
return ret;
} }
finally finally
{ {