Kinda Late, but my plugin now prevents Log4J

Author: KRYMZ0N

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.krymz0n</groupId>
     <artifactId>SimpleExploitFixer</artifactId>
-    <version>1.5</version>
+    <version>1.6</version>
     <packaging>jar</packaging>
 
     <name>SimpleExploitFixer</name>

src/main/java/me/krymz0n/simpleexploitfixer/Main.java

@@ -4,6 +4,7 @@
 import me.krymz0n.simpleexploitfixer.commands.Reload;
 import me.krymz0n.simpleexploitfixer.listener.*;
 import me.krymz0n.simpleexploitfixer.listener.exploit.BowBomb;
+import me.krymz0n.simpleexploitfixer.listener.exploit.Log4J;
 import me.krymz0n.simpleexploitfixer.listener.exploit.TabComplete;
 import me.krymz0n.simpleexploitfixer.listener.lag.*;
 import me.krymz0n.simpleexploitfixer.listener.misc.Chat;
@@ -45,7 +46,8 @@ public void onEnable() {
         pm.registerEvents(new Rail(this), this);
         pm.registerEvents(new Chat(this), this);
         pm.registerEvents(new BowBomb(this), this);
-        pm.registerEvents(new TabComplete(this), this);
+        //pm.registerEvents(new TabComplete(this), this);
+        pm.registerEvents(new Log4J(this), this);
 
         Objects.requireNonNull(getCommand("sef")).setExecutor(new Reload(this));
 

src/main/java/me/krymz0n/simpleexploitfixer/listener/ProtocolLib.java

@@ -46,35 +46,6 @@ public void onPacketReceiving(PacketEvent event) {
                             }
                         }
                     });
-
-            protocolManager.addPacketListener(
-                    new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Client.TAB_COMPLETE) {
-
-                        @Override
-                        public void onPacketReceiving(PacketEvent event) {
-                            if (event.getPacketType() == PacketType.Play.Client.TAB_COMPLETE) {
-                                System.out.println("0");
-                                PacketContainer packet = event.getPacket();
-                                String command = packet.getStrings().read(0); // reads the amount of strings that are sent on the packet.
-                                if (command.equals("/")) {
-                                    event.setCancelled(true);
-                                    System.out.println("1");
-                                    if (plugin.getConfig().getBoolean("SendFakePlugins")) {
-                                        Player player = event.getPlayer();
-                                        PacketContainer response = new PacketContainer(PacketType.Play.Server.TAB_COMPLETE);
-                                        response.getStringArrays().write(0, Utils.formatPlugins());
-                                        try {
-                                            Main.getInstance().getProtocolManager().sendServerPacket(player, response);
-                                        } catch (Exception e) {
-                                            e.printStackTrace();
-                                        }
-                                    }
-
-                                }
-                            }
-                        }
-                    }
-            );
         }
     }
 }

src/main/java/me/krymz0n/simpleexploitfixer/listener/exploit/Log4J.java

@@ -0,0 +1,41 @@
+package me.krymz0n.simpleexploitfixer.listener.exploit;
+
+import me.krymz0n.simpleexploitfixer.Main;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import java.util.Objects;
+
+public class Log4J implements Listener {
+    private final Main plugin;
+
+    public Log4J(Main plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onChat(AsyncPlayerChatEvent evt) {
+        if (plugin.getConfig().getBoolean("Log4J") && evt.getMessage().startsWith("${")) {
+            evt.setCancelled(true);
+        }
+    }
+
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onCommandPreprocess(PlayerCommandPreprocessEvent evt) {
+        if (plugin.getConfig().getBoolean("Log4J") && evt.getMessage().contains("${")) {
+            evt.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onDeathMessage(PlayerDeathEvent evt) {
+        if (plugin.getConfig().getBoolean("Log4J") && Objects.requireNonNull(evt.getDeathMessage()).contains("${")) {
+            evt.setCancelled(true);
+        }
+    }
+}

src/main/java/me/krymz0n/simpleexploitfixer/listener/exploit/TabComplete.java

@@ -14,7 +14,15 @@ public TabComplete(Main plugin) {
         this.plugin = plugin;
     }
 
-    @EventHandler // should work as a patch, however I need more testing before I make a new release.
+    @EventHandler
+    public void onTabComplete(PlayerCommandSendEvent evt) {
+        evt.getCommands().clear();
+        System.out.println("Cleared plugins list");
+        evt.getCommands().add("test");
+
+    }
+
+    @EventHandler
     public void onTabComplete(TabCompleteEvent evt) {
         System.out.println("test");
         if (evt.getBuffer().equalsIgnoreCase("/")) {

src/main/java/me/krymz0n/simpleexploitfixer/listener/misc/Chat.java

@@ -27,7 +27,12 @@ private void onChat(AsyncPlayerChatEvent evt) {
                 evt.setCancelled(true);
             }
 
-            if (evt.getMessage().contains("discord.gg") || evt.getMessage().contains("discord.com") || evt.getMessage().contains("discord.media") || evt.getMessage().contains("discordapp.com") || evt.getMessage().contains("discordapp.net") || evt.getMessage().contains("discordstatus.com")) {
+            if (evt.getMessage().contains("discord.gg")
+                    || evt.getMessage().contains("discord.com")
+                    || evt.getMessage().contains("discord.media")
+                    || evt.getMessage().contains("discordapp.com")
+                    || evt.getMessage().contains("discordapp.net")
+                    || evt.getMessage().contains("discordstatus.com")) {
                 evt.setCancelled(true);
             }
         }

src/main/java/me/krymz0n/simpleexploitfixer/listener/misc/InteractEvent.java

@@ -27,14 +27,17 @@ public InteractEvent(Main plugin) {
     public void onInteract(PlayerInteractEvent evt) {
         if (plugin.getConfig().getBoolean("DisableRespawnAnchorExplosions")) {
             Player p = evt.getPlayer();
+
             if (evt.getAction() == Action.RIGHT_CLICK_BLOCK) {
                 Block block = evt.getClickedBlock();
                 assert block != null;
+
                 if (block.getType().equals(Material.RESPAWN_ANCHOR)) {
-                    final RespawnAnchor ra = (RespawnAnchor) block.getBlockData();
+                    final RespawnAnchor ra = (RespawnAnchor) block.getBlockData(); // Getting the block data
+
                     if (evt.getMaterial().equals(Material.GLOWSTONE) && ra.getCharges() >= ra.getMaximumCharges() || !evt.getMaterial().equals(Material.GLOWSTONE) && ra.getCharges() > 0  && !p.getWorld().getEnvironment().equals(World.Environment.NETHER)) {
                         evt.setCancelled(true);
-                        Audience.audience(p).sendActionBar(Component.text(ChatColor.RED + "Due to a poll in the discord, respawn anchor explosions have been disabled"));
+                        Audience.audience(p).sendActionBar(Component.text(ChatColor.RED + "Due to a poll in the discord, respawn anchor explosions have been disabled")); //sending action bar
                     }
                 }
             }

src/main/java/me/krymz0n/simpleexploitfixer/util/Utils.java

@@ -1,6 +1,7 @@
 package me.krymz0n.simpleexploitfixer.util;
 
 import me.krymz0n.simpleexploitfixer.Main;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
 
 import java.util.ArrayList;

src/main/resources/config.yml

@@ -73,6 +73,9 @@ DelayOfRailClock: 1
 PreventBowBombExploit: true
 MaxBowSquaredVelocity: 15
 
+# Log4Shell
+Log4J: true
+
 # ProtocolLib
 DisableAllProtocolLib: false
 PreventNoComCoordinateExploit: true