Archiviert
1
0

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/de/steamwar/bungeecore/listeners/BrandListener.java
Dieser Commit ist enthalten in:
yoyosource 2022-04-27 09:59:21 +02:00
Commit 07da2c56a3
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen

2
.gitmodules vendored
Datei anzeigen

@ -1,3 +1,3 @@
[submodule "CommonCore"] [submodule "CommonCore"]
path = CommonCore path = CommonCore
url = gitea@steamwar.de:SteamWar/CommonCore.git url = https://steamwar.de/devlabs/SteamWar/CommonCore.git

Datei anzeigen

@ -58,9 +58,9 @@ public class BrandListener extends BasicListener {
if (!(event.getReceiver() instanceof ProxiedPlayer)) { if (!(event.getReceiver() instanceof ProxiedPlayer)) {
return; return;
} }
ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
event.setCancelled(true); event.setCancelled(true);
ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
String brandString = ChatSender.of(player).parseToLegacy("STEAMWAR_BRAND", ProxyServer.getInstance().getName(), player.getServer().getInfo().getName(), new String(event.getData(), 1, event.getData().length - 1)); String brandString = ChatSender.of(player).parseToLegacy("STEAMWAR_BRAND", ProxyServer.getInstance().getName(), player.getServer().getInfo().getName(), new String(event.getData(), 1, event.getData().length - 1));
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();