From c35288bee801e6c383b7aeb154acefb41f5bea75 Mon Sep 17 00:00:00 2001 From: "admin@heddo.eu" Date: Tue, 17 Dec 2024 11:23:21 +0100 Subject: [PATCH] The PluginMessageEvent should not be cancelled if you have also installed this plugin in Spigot/Paper etc. --- .../DefaultPluginMessageListener.java | 5 +--- .../server/minestom/Slf4jPlatformLogger.java | 24 +++++++++++++++++++ .../DefaultPluginMessageListener.java | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/server/bungeecord/src/main/java/net/labymod/serverapi/server/bungeecord/listener/DefaultPluginMessageListener.java b/server/bungeecord/src/main/java/net/labymod/serverapi/server/bungeecord/listener/DefaultPluginMessageListener.java index 4cf997f..879026e 100644 --- a/server/bungeecord/src/main/java/net/labymod/serverapi/server/bungeecord/listener/DefaultPluginMessageListener.java +++ b/server/bungeecord/src/main/java/net/labymod/serverapi/server/bungeecord/listener/DefaultPluginMessageListener.java @@ -55,10 +55,7 @@ public void onPluginMessage(PluginMessageEvent event) { try { PayloadReader reader = new PayloadReader(event.getData()); - Packet packet = this.protocol.handleIncomingPayload(player.getUniqueId(), reader); - if (packet != null) { - event.setCancelled(true); - } + this.protocol.handleIncomingPayload(player.getUniqueId(), reader); } catch (Exception e) { e.printStackTrace(); } diff --git a/server/minestom/src/main/java/net/labymod/serverapi/server/minestom/Slf4jPlatformLogger.java b/server/minestom/src/main/java/net/labymod/serverapi/server/minestom/Slf4jPlatformLogger.java index 08fa0e6..1b69cf7 100644 --- a/server/minestom/src/main/java/net/labymod/serverapi/server/minestom/Slf4jPlatformLogger.java +++ b/server/minestom/src/main/java/net/labymod/serverapi/server/minestom/Slf4jPlatformLogger.java @@ -1,3 +1,27 @@ +/* + * MIT License + * + * Copyright (c) 2024 LabyMedia GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package net.labymod.serverapi.server.minestom; import net.labymod.serverapi.api.logger.ProtocolPlatformLogger; diff --git a/server/velocity/src/main/java/net/labymod/serverapi/server/velocity/listener/DefaultPluginMessageListener.java b/server/velocity/src/main/java/net/labymod/serverapi/server/velocity/listener/DefaultPluginMessageListener.java index e410058..d71ca3f 100644 --- a/server/velocity/src/main/java/net/labymod/serverapi/server/velocity/listener/DefaultPluginMessageListener.java +++ b/server/velocity/src/main/java/net/labymod/serverapi/server/velocity/listener/DefaultPluginMessageListener.java @@ -57,7 +57,7 @@ public void onPluginMessage(PluginMessageEvent event) { PayloadReader reader = new PayloadReader(event.getData()); Packet packet = this.protocol.handleIncomingPayload(player.getUniqueId(), reader); if (packet != null) { - event.setResult(PluginMessageEvent.ForwardResult.handled()); + event.setResult(PluginMessageEvent.ForwardResult.forward()); } } catch (Exception e) { e.printStackTrace();