TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Implement MuteStatusChangeEvent. Fixes #819 (#832)

Browse source
This commit is contained in:
Ryan 2016-08-20 19:13:26 -06:00 committed by Blinky™
parent 16e05cc17b
commit dd226dfdcf
2 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/User.java
View file

@ -12,6 +12,7 @@ import net.ess3.api.IEssentials;
import net.ess3.api.MaxMoneyException; import net.ess3.api.MaxMoneyException;
import net.ess3.api.events.AfkStatusChangeEvent; import net.ess3.api.events.AfkStatusChangeEvent;
import net.ess3.api.events.JailStatusChangeEvent; import net.ess3.api.events.JailStatusChangeEvent;
import net.ess3.api.events.MuteStatusChangeEvent;
import net.ess3.api.events.UserBalanceUpdateEvent; import net.ess3.api.events.UserBalanceUpdateEvent;
import net.ess3.nms.refl.ReflUtil; import net.ess3.nms.refl.ReflUtil;
@ -505,11 +506,16 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
//Returns true if status expired during this check //Returns true if status expired during this check
public boolean checkMuteTimeout(final long currentTime) { public boolean checkMuteTimeout(final long currentTime) {
if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted()) { if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted()) {
final MuteStatusChangeEvent event = new MuteStatusChangeEvent(this, null, false);
ess.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
setMuteTimeout(0); setMuteTimeout(0);
sendMessage(tl("canTalkAgain")); sendMessage(tl("canTalkAgain"));
setMuted(false); setMuted(false);
return true; return true;
} }
}
return false; return false;
} }

8
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View file

@ -4,6 +4,7 @@ import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import net.ess3.api.events.MuteStatusChangeEvent;
import org.bukkit.Server; import org.bukkit.Server;
import java.util.logging.Level; import java.util.logging.Level;
@ -39,6 +40,12 @@ public class Commandmute extends EssentialsCommand {
} }
} }
final boolean willMute = (args.length > 1) ? true : !user.getMuted();
final User controller = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
final MuteStatusChangeEvent event = new MuteStatusChangeEvent(user, controller, willMute);
ess.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
long muteTimestamp = 0; long muteTimestamp = 0;
if (args.length > 1) { if (args.length > 1) {
@ -77,4 +84,5 @@ public class Commandmute extends EssentialsCommand {
user.sendMessage(tl("playerUnmuted")); user.sendMessage(tl("playerUnmuted"));
} }
} }
}
} }