From bba4eb4eec7cbe1ddcf1cf65be8fb35ce870e874 Mon Sep 17 00:00:00 2001 From: games647 Date: Sun, 3 Jul 2016 21:28:44 +0200 Subject: [PATCH] Ignore all canceled events --- .../bukkit/listener/protocollib/EncryptionPacketListener.java | 4 ++++ .../bukkit/listener/protocollib/StartPacketListener.java | 4 ++++ .../fastlogin/bungee/listener/PlayerConnectionListener.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/EncryptionPacketListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/EncryptionPacketListener.java index 74cd4fea..c3a323dd 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/EncryptionPacketListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/EncryptionPacketListener.java @@ -51,6 +51,10 @@ public class EncryptionPacketListener extends PacketAdapter { */ @Override public void onPacketReceiving(PacketEvent packetEvent) { + if (packetEvent.isCancelled()) { + return; + } + Player sender = packetEvent.getPlayer(); byte[] sharedSecret = packetEvent.getPacket().getByteArrays().read(0); diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/StartPacketListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/StartPacketListener.java index e05aec1e..b6d6a520 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/StartPacketListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/StartPacketListener.java @@ -52,6 +52,10 @@ public class StartPacketListener extends PacketAdapter { */ @Override public void onPacketReceiving(PacketEvent packetEvent) { + if (packetEvent.isCancelled()) { + return; + } + plugin.setServerStarted(); Player player = packetEvent.getPlayer(); diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java index e83dadd8..dfe5c077 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java @@ -49,6 +49,10 @@ public class PlayerConnectionListener implements Listener { @EventHandler public void onLogin(LoginEvent loginEvent) { + if (loginEvent.isCancelled()) { + return; + } + //use the loginevent instead of the postlogin event in order to send the loginsuccess packet to the client //with the offline uuid this makes it possible to set the skin then