diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java index 29e83112..a1002070 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java @@ -20,6 +20,7 @@ package de.steamwar.bausystem.features.world; import de.steamwar.bausystem.BauSystem; +import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; import org.bukkit.Bukkit; @@ -31,7 +32,7 @@ import org.bukkit.event.player.PlayerMoveEvent; @Linked(LinkageType.LISTENER) public class AFKStopperListener implements Listener { - private static final String afkWarning = BauSystem.PREFIX + "§cDieser Server wird bei weiterer Inaktivität in einer Minute gestoppt"; + private static final String afkWarning = BauSystem.PREFIX + ColorConfig.DISABLE + "Dieser Server wird bei weiterer Inaktivität in einer Minute gestoppt"; private int minutesAfk; @@ -41,7 +42,7 @@ public class AFKStopperListener implements Listener { switch (minutesAfk) { case 5: for (Player p : Bukkit.getOnlinePlayers()) - p.kickPlayer("§cAuf diesem Server ist seit 5 Minuten nichts passiert."); + p.kickPlayer(ColorConfig.DISABLE + "Auf diesem Server ist seit 5 Minuten nichts passiert."); break; case 4: Bukkit.broadcastMessage(afkWarning); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java index 8e9a2602..1baf6323 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java @@ -23,10 +23,8 @@ import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.features.tpslimit.TPSLimitUtils; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; -import de.steamwar.core.Core; import de.steamwar.scoreboard.SWScoreboard; import org.bukkit.Bukkit; -import org.bukkit.GameRule; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -50,10 +48,6 @@ public class AutoShutdownListener implements Listener { Player p = e.getPlayer(); p.setOp(true); - - if (Core.getVersion() == 15) { - Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, false); - } } @EventHandler diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java new file mode 100644 index 00000000..fb1f8499 --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java @@ -0,0 +1,35 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.features.world; + +import de.steamwar.bausystem.linkage.Enable; +import de.steamwar.bausystem.linkage.LinkageType; +import de.steamwar.bausystem.linkage.Linked; +import org.bukkit.Bukkit; +import org.bukkit.GameRule; + +@Linked(LinkageType.ENABLE_LINK) +public class ReducedDebugInfo implements Enable { + + @Override + public void enable() { + Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, false); + } +}