From 549f7e555c1f5c436e81754989c403772955ff72 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Sun, 30 Aug 2026 13:04:52 +0200 Subject: [PATCH] Remove NoTeamServer punishment --- CommonCore/SQL/src/de/steamwar/sql/Punishment.kt | 8 -------- .../src/de/steamwar/messages/BungeeCore.properties | 6 ------ .../src/de/steamwar/messages/BungeeCore_de.properties | 6 ------ .../src/de/steamwar/velocitycore/VelocityCore.java | 1 - 4 files changed, 21 deletions(-) diff --git a/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt b/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt index 8f5f3ed4e..3635ea251 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt @@ -183,14 +183,6 @@ class Punishment(id: EntityID) : IntEntity(id) { "UNNOFIGHTSERVER", UserPerm.MODERATION ), - NoTeamServer( - "NOTEAMSERVER_TEAM", - "NOTEAMSERVER_PERMA", - "NOTEAMSERVER_UNTIL", - "UNNOTEAMSERVER_ERROR", - "UNNOTEAMSERVER", - UserPerm.MODERATION - ), Note("NOTE_TEAM", null, null, null, null, UserPerm.PUNISHMENTS, true); fun isMulti() = diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties index 25c9004e5..6afbaf7e9 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties @@ -202,12 +202,6 @@ NOFIGHTSERVER_UNTIL = §7You are excluded from §e§lfighting§7 §euntil {0}§8 UNNOFIGHTSERVER_ERROR = §cThe player is not excluded from fighting. UNNOFIGHTSERVER = §e{0} §7may now join §e§lfights§7 again§8. -NOTEAMSERVER_TEAM = §e{0} §7was excluded from §e{1} {2} §7from §e§lteam servers§8: §f{3} -NOTEAMSERVER_PERMA = §7You are §epermanently§7 excluded from §e§lteam servers§8: §e{0} -NOTEAMSERVER_UNTIL = §7You are excluded from §e§lteam servers§7 §euntil {0}§8: §e{1} -UNNOTEAMSERVER_ERROR = §cThe player is not excluded from team servers. -UNNOTEAMSERVER = §e{0} §7may now set §e§lteam servers§7 again§8. - NOTE_TEAM = §e{0} §7received a §e§lnote§7 from §e{1} {2}: §f{3} #BugCommand diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties index c284208b9..5921259a9 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties @@ -184,12 +184,6 @@ NOFIGHTSERVER_UNTIL = §7Du bist §ebis zum {0} §7vom §e§lKämpfen§7 ausgesc UNNOFIGHTSERVER_ERROR = §cDer Spieler ist nicht vom Kämpfen ausgeschlossen. UNNOFIGHTSERVER = §e{0} §7darf nun wieder §e§lKämpfen§7 beitreten§8. -NOTEAMSERVER_TEAM = §e{0} §7wurde von §e{1} {2} §7vom §e§lTeamserver§7 setzen ausgeschlossen§8: §f{3} -NOTEAMSERVER_PERMA = §7Du bist §epermanent §7vom §e§lTeamserver§7 setzen ausgeschlossen§8: §e{0} -NOTEAMSERVER_UNTIL = §7Du bist §ebis zum {0} §7vom §e§lTeamserver§7 setzen ausgeschlossen§8: §e{1} -UNNOTEAMSERVER_ERROR = §cDer Spieler ist nicht vom Teamserver setzten ausgeschlossen. -UNNOTEAMSERVER = §e{0} §7darf nun wieder §e§lTeamserver§7 setzen§8. - NOTE_TEAM = §e{0} §7erhielt von §e{1} {2} §7die §e§lNotiz§7§8: §f{3} #BugCommand diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java index 31866c876..6240f0c0f 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java +++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java @@ -149,7 +149,6 @@ public class VelocityCore implements ReloadablePlugin { new PunishmentCommand("noschemsubmitting", Punishment.PunishmentType.NoSchemSubmitting); new PunishmentCommand("nodev", Punishment.PunishmentType.NoDevServer); new PunishmentCommand("nofight", Punishment.PunishmentType.NoFightServer); - new PunishmentCommand("noteamserver", Punishment.PunishmentType.NoTeamServer); new PunishmentCommand("note", Punishment.PunishmentType.Note); linker = new AbstractLinker<>(this) {