SteamWar/BungeeCore
Archiviert
13
2

Merge pull request 'See Security-Breach issue' (#209) from Security-Breach-Fix into master

Reviewed-on: #209
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2021-05-18 19:32:51 +02:00
Commit bac1e3eaee

Datei anzeigen

@ -217,12 +217,13 @@ public class BauCommand {
} }
target.remove(); target.remove();
ProxiedPlayer z = ProxyServer.getInstance().getPlayer(SteamwarUser.get(target.getMemberID()).getUuid()); ProxiedPlayer toRemove = ProxyServer.getInstance().getPlayer(SteamwarUser.get(target.getMemberID()).getUuid());
if(z != null){ if(toRemove != null){
Message.send("BAU_DELMEMBER_DELETED_TARGET", z, p.getName()); Message.send("BAU_DELMEMBER_DELETED_TARGET", toRemove, p.getName());
Subserver server = Subserver.getSubserver(z); Subserver currentServer = Subserver.getSubserver(toRemove.getServer().getInfo());
if(server != null && server.getType() == Servertype.BAUSERVER && ((Bauserver)server).getOwner().equals(p.getUniqueId())) if (currentServer != null && currentServer.getType() == Servertype.BAUSERVER && ((Bauserver) currentServer).getOwner().equals(p.getUniqueId())) {
z.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LOBBY_SERVER)); toRemove.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LOBBY_SERVER));
}
} }
Message.send("BAU_DELMEMBER_DELETED", p); Message.send("BAU_DELMEMBER_DELETED", p);
} }