From e661d876b11cd1ccc8a623c68c20394c0ffa9ab7 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 12:04:06 +0100 Subject: [PATCH 1/3] Temp Tp Fix --- src/de/steamwar/bungeecore/commands/JoinmeCommand.java | 6 +++--- src/de/steamwar/bungeecore/commands/TpCommand.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java index 37fb8061..97802144 100644 --- a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java +++ b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java @@ -67,13 +67,13 @@ public class JoinmeCommand extends BasicCommand { subserver.sendPlayer(player); } else { SubserverSystem.sendDeniedMessage(player, bauserver.getOwner()); - Message.send("JOIN_PLAYER_BLOCK", player); + Message.send("MSG_IGNORED", player); } } }else if(serverPerm != null && !player.hasPermission(serverPerm)){ - Message.send("JOIN_PLAYER_BLOCK", player); + Message.send("MSG_IGNORED", player); }else if(serverPerm == null && !player.getGroups().contains("team")) { - Message.send("JOIN_PLAYER_BLOCK", player); + Message.send("MSG_IGNORED", player); }else{ player.connect(server); } diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java index ae2f9a99..28624dfc 100644 --- a/src/de/steamwar/bungeecore/commands/TpCommand.java +++ b/src/de/steamwar/bungeecore/commands/TpCommand.java @@ -126,13 +126,13 @@ public class TpCommand extends BasicCommand { subserver.sendPlayer(player); } else { SubserverSystem.sendDeniedMessage(player, bauserver.getOwner()); - Message.send("JOIN_PLAYER_BLOCK", player); + Message.send("MSG_IGNORED", player); } } }else if(serverPerm != null && !player.hasPermission(serverPerm)){ - Message.send("JOIN_PLAYER_BLOCK", player); + Message.send("MSG_IGNORED", player); }else if(serverPerm == null && !player.getGroups().contains("team")) { - Message.send("JOIN_PLAYER_BLOCK", player); + Message.send("MSG_IGNORED", player); }else{ player.connect(server); } From 9ad9a2c83581368f160a7324a174f1a120ef435b Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 12:28:35 +0100 Subject: [PATCH 2/3] Add ResourcereloadCommand --- src/de/steamwar/bungeecore/BungeeCore.java | 1 + .../commands/ResourcereloadCommand.java | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/de/steamwar/bungeecore/commands/ResourcereloadCommand.java diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index 2f5fc946..89a07fc3 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -120,6 +120,7 @@ public class BungeeCore extends Plugin { new IgnoreCommand(); new UnIgnoreCommand(); new PollresultCommand(); + new ResourcereloadCommand(); if(!EVENT_MODE){ new WebregisterCommand(); diff --git a/src/de/steamwar/bungeecore/commands/ResourcereloadCommand.java b/src/de/steamwar/bungeecore/commands/ResourcereloadCommand.java new file mode 100644 index 00000000..0789c487 --- /dev/null +++ b/src/de/steamwar/bungeecore/commands/ResourcereloadCommand.java @@ -0,0 +1,36 @@ +/* + This file is a part of the SteamWar software. + + Copyright (C) 2020 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.bungeecore.commands; + +import net.md_5.bungee.api.CommandSender; + +import java.util.ResourceBundle; + +public class ResourcereloadCommand extends BasicCommand { + + public ResourcereloadCommand() { + super("resourcereload", "bungeecore.softreload", "rr"); + } + + @Override + public void execute(CommandSender commandSender, String[] strings) { + ResourceBundle.clearCache(); + } +} From 6f6327d60f41af3a34813675310b0adfa5610a7a Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 12:29:41 +0100 Subject: [PATCH 3/3] Add ResourcereloadCommand --- src/de/steamwar/bungeecore/commands/JoinmeCommand.java | 6 +++--- src/de/steamwar/bungeecore/commands/TpCommand.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java index 97802144..37fb8061 100644 --- a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java +++ b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java @@ -67,13 +67,13 @@ public class JoinmeCommand extends BasicCommand { subserver.sendPlayer(player); } else { SubserverSystem.sendDeniedMessage(player, bauserver.getOwner()); - Message.send("MSG_IGNORED", player); + Message.send("JOIN_PLAYER_BLOCK", player); } } }else if(serverPerm != null && !player.hasPermission(serverPerm)){ - Message.send("MSG_IGNORED", player); + Message.send("JOIN_PLAYER_BLOCK", player); }else if(serverPerm == null && !player.getGroups().contains("team")) { - Message.send("MSG_IGNORED", player); + Message.send("JOIN_PLAYER_BLOCK", player); }else{ player.connect(server); } diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java index 28624dfc..ae2f9a99 100644 --- a/src/de/steamwar/bungeecore/commands/TpCommand.java +++ b/src/de/steamwar/bungeecore/commands/TpCommand.java @@ -126,13 +126,13 @@ public class TpCommand extends BasicCommand { subserver.sendPlayer(player); } else { SubserverSystem.sendDeniedMessage(player, bauserver.getOwner()); - Message.send("MSG_IGNORED", player); + Message.send("JOIN_PLAYER_BLOCK", player); } } }else if(serverPerm != null && !player.hasPermission(serverPerm)){ - Message.send("MSG_IGNORED", player); + Message.send("JOIN_PLAYER_BLOCK", player); }else if(serverPerm == null && !player.getGroups().contains("team")) { - Message.send("MSG_IGNORED", player); + Message.send("JOIN_PLAYER_BLOCK", player); }else{ player.connect(server); }