From 95b8fa1b29289af042229982c9f314d679585e7e Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sat, 23 Apr 2022 12:29:01 +0200 Subject: [PATCH 1/2] :bug: Update to Https --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 083047ed..ffabdd8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "CommonCore"] path = CommonCore - url = gitea@steamwar.de:SteamWar/CommonCore.git + url = https://steamwar.de/devlabs/SteamWar/CommonCore.git From 50ac0ddc553629e3b206be75c987b4141a3364de Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sun, 24 Apr 2022 17:54:06 +0200 Subject: [PATCH 2/2] Speed Brandlistener up Signed-off-by: Lixfel --- .../bungeecore/listeners/BrandListener.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/de/steamwar/bungeecore/listeners/BrandListener.java b/src/de/steamwar/bungeecore/listeners/BrandListener.java index c26baa79..6ff10e5f 100644 --- a/src/de/steamwar/bungeecore/listeners/BrandListener.java +++ b/src/de/steamwar/bungeecore/listeners/BrandListener.java @@ -19,6 +19,7 @@ package de.steamwar.bungeecore.listeners; +import de.steamwar.bungeecore.BungeeCore; import de.steamwar.messages.ChatSender; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; @@ -43,14 +44,16 @@ public class BrandListener extends BasicListener { if (!(event.getReceiver() instanceof ProxiedPlayer)) { return; } - ProxiedPlayer player = (ProxiedPlayer) event.getReceiver(); - event.setCancelled(true); - 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(); - DefinedPacket.writeString(brandString, brand); - player.sendData(event.getTag(), DefinedPacket.toArray(brand)); - brand.release(); + 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)); + + ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); + DefinedPacket.writeString(brandString, brand); + player.sendData(event.getTag(), DefinedPacket.toArray(brand)); + brand.release(); + }); } }