From 8b776863a0d4079380a75b594b34c094dbc96fab Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 4 May 2021 18:33:31 +0000 Subject: [PATCH 1/5] Add check on plugin message recieve --- src/main/java/us/ajg0702/queue/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index 8ace70d..2f504c8 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -281,6 +281,7 @@ public class Main extends Plugin implements Listener { public void onMessage(PluginMessageEvent e) { //getLogger().info("Recieved message of "+e.getTag()); if(!e.getTag().equals("ajqueue:tobungee")) return; + if(!(e.getReceiver() instanceof ProxiedPlayer)) return; e.setCancelled(true); DataInputStream in = new DataInputStream(new ByteArrayInputStream(e.getData())); try { From b44dd1916821af5de7892a243d395281d74d63c6 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 5 May 2021 15:25:53 +0000 Subject: [PATCH 2/5] Should fix spigot commands from console --- src/main/java/us/ajg0702/queue/spigot/Commands.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/us/ajg0702/queue/spigot/Commands.java b/src/main/java/us/ajg0702/queue/spigot/Commands.java index fbb60ba..dd1bd41 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Commands.java +++ b/src/main/java/us/ajg0702/queue/spigot/Commands.java @@ -16,9 +16,9 @@ public class Commands implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if(!(sender instanceof Player)) return true; Player player = (Player) sender; if(command.getName().equals("leavequeue")) { + if(!(sender instanceof Player)) return true; StringBuilder arg = new StringBuilder(); for(String a : args) { arg.append(" "); From 8eb99d11492d060f0933d23a25cae1d486fc3ac3 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 5 May 2021 15:32:54 +0000 Subject: [PATCH 3/5] Better --- src/main/java/us/ajg0702/queue/spigot/Commands.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/us/ajg0702/queue/spigot/Commands.java b/src/main/java/us/ajg0702/queue/spigot/Commands.java index dd1bd41..c602dda 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Commands.java +++ b/src/main/java/us/ajg0702/queue/spigot/Commands.java @@ -16,9 +16,12 @@ public class Commands implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - Player player = (Player) sender; + Player player; + if(sender instanceof Player) { + player = (Player) sender; + } if(command.getName().equals("leavequeue")) { - if(!(sender instanceof Player)) return true; + if(player == null) return true; StringBuilder arg = new StringBuilder(); for(String a : args) { arg.append(" "); From 2d7bdd25dffd6db54c2beb1f3e8b233a68f67c5f Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 5 May 2021 15:38:28 +0000 Subject: [PATCH 4/5] oops --- src/main/java/us/ajg0702/queue/spigot/Commands.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/us/ajg0702/queue/spigot/Commands.java b/src/main/java/us/ajg0702/queue/spigot/Commands.java index c602dda..356fd41 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Commands.java +++ b/src/main/java/us/ajg0702/queue/spigot/Commands.java @@ -16,7 +16,7 @@ public class Commands implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - Player player; + Player player = null; if(sender instanceof Player) { player = (Player) sender; } From 0db8c671a37529143693afac4d52387b8ba6d88f Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sat, 8 May 2021 07:46:09 -0700 Subject: [PATCH 5/5] Should fix being able to send packets to manipulate spigot side --- src/main/java/us/ajg0702/queue/Main.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index 2f504c8..3eaab6a 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -280,6 +280,10 @@ public class Main extends Plugin implements Listener { @EventHandler public void onMessage(PluginMessageEvent e) { //getLogger().info("Recieved message of "+e.getTag()); + if(e.getTag().equals("ajqueue:tospigot")) { + e.setCancelled(true); + return; + } if(!e.getTag().equals("ajqueue:tobungee")) return; if(!(e.getReceiver() instanceof ProxiedPlayer)) return; e.setCancelled(true);