Archiviert
1
0

Merge remote-tracking branch 'origin/Punishment++' into Punishment++

Dieser Commit ist enthalten in:
yoyosource 2022-04-26 18:18:34 +02:00
Commit aaf389ea4c
2 geänderte Dateien mit 11 neuen und 8 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

@ -19,6 +19,7 @@
package de.steamwar.bungeecore.listeners; package de.steamwar.bungeecore.listeners;
import de.steamwar.bungeecore.BungeeCore;
import de.steamwar.messages.ChatSender; import de.steamwar.messages.ChatSender;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
@ -43,14 +44,16 @@ 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);
ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.get(), () -> {
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();
DefinedPacket.writeString(brandString, brand); DefinedPacket.writeString(brandString, brand);
player.sendData(event.getTag(), DefinedPacket.toArray(brand)); player.sendData(event.getTag(), DefinedPacket.toArray(brand));
brand.release(); brand.release();
});
} }
} }