Merge branch 'development' into dependabot/github_actions/development/actions/setup-java-3.11.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.9.0 to 3.11.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.9.0...v3.11.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
       uses: actions/checkout@v3
       
     - name: Setup Java JDK
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v3.11.0
       with:
         # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
         java-version: 17

.github/workflows/java17-maven.yml

@@ -13,7 +13,7 @@ jobs:
 
     # Java 16 Builds
     - name: Set up JDK 17
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v3.11.0
       with:
         java-version: 17
         distribution: 'adopt'

src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java

@@ -1,17 +1,25 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.common.collect.Multimap;
 import io.papermc.lib.PaperLib;
 
-import net.kyori.adventure.text.Component;
+import java.util.Collection;
-import net.kyori.adventure.text.format.NamedTextColor;
+import java.util.Map;
+import java.util.Objects;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.spigotmc.event.player.PlayerSpawnLocationEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 public class MovementValidator extends FreedomService
 {
@@ -33,36 +41,67 @@ public class MovementValidator extends FreedomService
     public void onPlayerTeleport(PlayerTeleportEvent event)
     {
         // Check absolute value to account for negatives
-        if (isOutOfBounds(event.getTo()))
+        if (Math.abs(Objects.requireNonNull(event.getTo()).getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
         {
             event.setCancelled(true); // illegal position, cancel it
         }
     }
 
-    private boolean isOutOfBounds(final Location position)
-    {
-        return Math.abs(position.getX()) >= MAX_XYZ_COORD || Math.abs(position.getY()) >= MAX_XYZ_COORD || Math.abs(position.getZ()) >= MAX_XYZ_COORD;
-    }
-
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerMove(PlayerMoveEvent event)
     {
         final Player player = event.getPlayer();
         Location from = event.getFrom();
         Location to = event.getTo();
-        double distance = from.distanceSquared(to);
+        assert to != null;
-
+        if (to.getX() >= from.getX() + MAX_DISTANCE_TRAVELED || to.getY() >= from.getY() + MAX_DISTANCE_TRAVELED || to.getZ() >= from.getZ() + MAX_DISTANCE_TRAVELED)
-        if (distance >= MAX_DISTANCE_TRAVELED)
         {
             event.setCancelled(true);
-            player.kick(Component.text("You were moving too quickly!", NamedTextColor.RED));
+            player.kickPlayer(ChatColor.RED + "You were moving too quickly!");
         }
         // Check absolute value to account for negatives
-        if (isOutOfBounds(event.getTo()))
+        if (Math.abs(event.getTo().getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
         {
             event.setCancelled(true);
             PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation());
         }
+
+        if (exploitItem(event.getPlayer().getInventory().getHelmet()))
+        {
+            event.getPlayer().getInventory().setHelmet(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your helmet slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getBoots()))
+        {
+            event.getPlayer().getInventory().setBoots(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your boots slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getLeggings()))
+        {
+            event.getPlayer().getInventory().setLeggings(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your leggings slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getChestplate()))
+        {
+            event.getPlayer().getInventory().setChestplate(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your chestplate slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getItemInMainHand()))
+        {
+            event.getPlayer().getInventory().setItemInMainHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your hand.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getItemInOffHand()))
+        {
+            event.getPlayer().getInventory().setItemInOffHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your offhand.");
+            event.setCancelled(true);
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
@@ -71,28 +110,72 @@ public class MovementValidator extends FreedomService
         final Player player = event.getPlayer();
 
         // Validate position
-        if (isOutOfBounds(player.getLocation()))
+        if (Math.abs(player.getLocation().getX()) >= MAX_XYZ_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XYZ_COORD || Math.abs(player.getLocation().getY()) >= MAX_XYZ_COORD)
         {
             PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler
-    public void onPlayerSpawn(PlayerSpawnLocationEvent event)
+    public void onPlayerHoldItem(PlayerItemHeldEvent event)
     {
-        final Location playerSpawn = event.getSpawnLocation();
+        if (exploitItem(event.getPlayer().getInventory().getItemInMainHand()))
-        final Location worldSpawn = event.getPlayer().getWorld().getSpawnLocation();
-
-        // If the player's spawn is equal to the world's spawn, there is no need to check.
-        // This will also prevent any possible feedback loops pertaining to setting an out of bounds world spawn to the same world spawn.
-        if (playerSpawn == worldSpawn)
         {
-            return;
+            event.getPlayer().getInventory().setItemInMainHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your hand.");
         }
-
+        if (exploitItem(event.getPlayer().getInventory().getItemInOffHand()))
-        if (isOutOfBounds(worldSpawn))
         {
-            event.setSpawnLocation(worldSpawn);
+            event.getPlayer().getInventory().setItemInOffHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your offhand.");
         }
     }
+
+    private Boolean exploitItem(ItemStack item)
+    {
+        if (item == null)
+        {
+            return false;
+        }
+
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null)
+        {
+            Multimap<Attribute, AttributeModifier> attributes = meta.getAttributeModifiers();
+            if (attributes != null)
+            {
+                Map<Attribute, Collection<AttributeModifier>> attrMap = attributes.asMap();
+
+                // For every attribute...
+                for (Attribute attr : attributes.keySet())
+                {
+                    // Default values
+                    boolean posInf = false;
+                    boolean negInf = false;
+
+                    // For every AttributeModifier...
+                    for (AttributeModifier modifier : attrMap.get(attr))
+                    {
+                        // Are they ∞ or -∞?
+                        if (modifier.getAmount() == Double.POSITIVE_INFINITY)
+                        {
+                            posInf = true;
+                        }
+                        else if (modifier.getAmount() == Double.NEGATIVE_INFINITY)
+                        {
+                            negInf = true;
+                        }
+                    }
+
+                    // Are both values set as true?
+                    if (posInf && negInf)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+        }
+        return false;
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java

@@ -108,16 +108,6 @@ public class EventBlocker extends FreedomService
 
         event.setRadius(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
     }
-    
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onBlockExplode(BlockExplodeEvent event) {
-        if(!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) {
-            event.setCancelled(true);
-            return;
-        }
-
-        event.setYield(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
-    }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockExplode(BlockExplodeEvent event)

src/main/resources/plugin.yml

@@ -18,4 +18,4 @@ libraries:
   - org.apache.commons:commons-lang3:3.12.0
   - commons-io:commons-io:2.11.0
   - org.jetbrains:annotations:23.0.0
-  - org.javassist:javassist:3.29.1-GA
+  - org.javassist:javassist:3.29.1-GA