Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Revert "Add SilentMute Punishment type"

Quellcode durchsuchen 
This reverts commit ee4090941e.
Dieser Commit ist enthalten in:
yoyosource 2022-03-31 15:46:48 +02:00
Ursprung b85cb000ac
Commit 029285aaba
7 geänderte Dateien mit 1 neuen und 19 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
src/de/steamwar/bungeecore/BungeeCore.java
Datei anzeigen

@ -128,7 +128,6 @@ public class BungeeCore extends Plugin {
// Punishment Commands:
new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
new PunishmentCommand("mute", Punishment.PunishmentType.Mute);
new PunishmentCommand("silentmute", Punishment.PunishmentType.SilentMute);
new PunishmentCommand("noschemreceiving", Punishment.PunishmentType.NoSchemReceiving);
new PunishmentCommand("noschemsharing", Punishment.PunishmentType.NoSchemSharing);
new PunishmentCommand("noschemsubmitting", Punishment.PunishmentType.NoSchemSubmitting);

2
src/de/steamwar/bungeecore/bot/listeners/IngameChatListener.java
Datei anzeigen

@ -51,7 +51,7 @@ public class IngameChatListener extends BasicDiscordListener {
event.getMessage().delete().queue();
return;
}
if (steamwarUser.isPunished(Punishment.PunishmentType.Mute) || steamwarUser.isPunished(Punishment.PunishmentType.SilentMute) || steamwarUser.isPunished(Punishment.PunishmentType.Ban)) {
if (steamwarUser.isPunished(Punishment.PunishmentType.Mute) || steamwarUser.isPunished(Punishment.PunishmentType.Ban)) {
event.getMessage().delete().queue();
return;
}

3
src/de/steamwar/bungeecore/commands/MsgCommand.java
Datei anzeigen

@ -49,9 +49,6 @@ public class MsgCommand extends BasicCommand {
}
SteamwarUser user = SteamwarUser.get(player);
if (user.isPunished(Punishment.PunishmentType.SilentMute)) {
return;
}
if (user.isPunishedWithMessage(player, Punishment.PunishmentType.Mute)) {
return;
}

3
src/de/steamwar/bungeecore/commands/RCommand.java
Datei anzeigen

@ -45,9 +45,6 @@ public class RCommand extends BasicCommand {
}
SteamwarUser user = SteamwarUser.get(player);
if (user.isPunished(Punishment.PunishmentType.SilentMute)) {
return;
}
if (user.isPunishedWithMessage(player, Punishment.PunishmentType.Mute)) {
return;
}

6
src/de/steamwar/bungeecore/listeners/ChatListener.java
Datei anzeigen

@ -151,9 +151,6 @@ public class ChatListener extends BasicListener {
}
SteamwarUser user = SteamwarUser.get(sender);
if (user.isPunished(Punishment.PunishmentType.SilentMute)) {
return;
}
if (user.isPunishedWithMessage(sender, Punishment.PunishmentType.Mute)) {
e.setCancelled(true);
return;
@ -238,9 +235,6 @@ public class ChatListener extends BasicListener {
}
SteamwarUser user = SteamwarUser.get(sender);
if (user.isPunished(Punishment.PunishmentType.SilentMute)) {
return;
}
if (user.isPunishedWithMessage(sender, Punishment.PunishmentType.Mute)) {
e.setCancelled(true);
return;

1
src/de/steamwar/bungeecore/sql/Punishment.java
Datei anzeigen

@ -131,7 +131,6 @@ public class Punishment {
public enum PunishmentType {
Ban(false, "BAN_TEAM", "BAN_PERMA", "BAN_UNTIL", "UNBAN_ERROR", "UNBAN"),
Mute( false, "MUTE_TEAM", "MUTE_PERMA", "MUTE_UNTIL", "UNMUTE_ERROR", "UNMUTE"),
SilentMute( false, "SILENTMUTE_TEAM", "", "", "UNSILENTMUTE_ERROR", "UNSILENTMUTE"),
NoSchemReceiving(false, "NOSCHEMRECEIVING_TEAM", "NOSCHEMRECEIVING_PERMA", "NOSCHEMRECEIVING_UNTIL", "UNNOSCHEMRECEIVING_ERROR", "UNNOSCHEMRECEIVING"),
NoSchemSharing(false, "NOSCHEMSHARING_TEAM", "NOSCHEMSHARING_PERMA", "NOSCHEMSHARING_UNTIL", "UNNOSCHEMSHARING_ERROR", "UNNOSCHEMSHARING"),
NoSchemSubmitting(true, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),

4
src/de/steamwar/messages/BungeeCore.properties
Datei anzeigen

@ -130,10 +130,6 @@ MUTE_UNTIL=§7Du bist §ebis zum {0} §e§lgemuted§8. §7Grund§8: §e{1}
UNMUTE_ERROR=§cDer Spieler ist nicht gemuted.
UNMUTE=§7Du hast §e{0} §e§lentmuted.
SILENTMUTE_TEAM={0} §e{1} §7wurde von §e{2} {3} §e§lgemuted§8. §7Grund§8: §f{4}
UNSILENTMUTE_ERROR=§cDer Spieler ist nicht gemuted.
UNSILENTMUTE=§7Du hast §e{0} §e§lentmuted.
NOSCHEMRECEIVING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematicerhalten ausgeschlossen§8. §7Grund§8: §f{4}
NOSCHEMRECEIVING_PERMA=§7Du bist §epermanent §7vom Erhalten von §e§lSchematics ausgeschlossen§8. §7Grund§8: §e{0}
NOSCHEMRECEIVING_UNTIL=§7Du bist §ebis zum {0} §7vom Erhalten von §e§lSchematics ausgeschlossen§8. §7Grund§8: §e{1}