Further cleanup and bugfixes

Signed-off-by: Pablo Herrera <pabloherrerapalacio@gmail.com>

Author: Pablete1234

core/src/main/java/tc/oc/pgm/projectile/ProjectileMatchModule.java

@@ -122,9 +122,9 @@ public void onClickEvent(PlayerInteractEvent event) {
           }
         }
         case ProjectileDefinition.BlockEntityType ce -> {
-          var be = BlockEntity.spawnBlockEntity(
-              player.getEyeLocation(), definition.blockMaterial, ce.size(), velocity);
-          new BlockRunner(definition, be, player, player.getEyeLocation());
+          Location loc = player.getEyeLocation();
+          var be = BlockEntity.spawnBlockEntity(loc, definition.blockMaterial, ce.size(), velocity);
+          new BlockRunner(definition, be, player, loc);
         }
       }
 
@@ -371,11 +371,9 @@ private void cancel() {
 
     private boolean blockDisplayCollision(Location location) {
       double radius = 0.5 * ce.size();
-      // Make location be center of the entity instead of feet
-      location.setY(location.getY() + radius);
 
       if (definition.damage != null) {
-        for (Player victim : location.getNearbyPlayers(0.5 * ce.size())) {
+        for (Player victim : location.getNearbyPlayers(radius)) {
           var mpVictim = match.getPlayer(victim);
           if (MatchPlayers.canInteract(mpVictim) && mpVictim.getParty() != shooterParty) {
             victim.damage(definition.damage, player);
@@ -384,13 +382,12 @@ private boolean blockDisplayCollision(Location location) {
         }
       }
       if (ce.solidBlockCollision()) {
-
         int x1 = (int) Math.floor(location.getX() - radius);
-        int y1 = (int) Math.floor(location.getY());
+        int y1 = (int) Math.floor(location.getY() - radius);
         int z1 = (int) Math.floor(location.getZ() - radius);
 
         int x2 = (int) Math.floor(location.getX() + radius);
-        int y2 = (int) Math.floor(location.getY() + ce.size());
+        int y2 = (int) Math.floor(location.getY() + radius);
         int z2 = (int) Math.floor(location.getZ() + radius);
 
         Location loc = location.clone();
@@ -407,8 +404,6 @@ private boolean blockDisplayCollision(Location location) {
         }
       }
 
-      // revert back to normal
-      location.setY(location.getY() - radius);
       return false;
     }
   }

platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/entities/ModernBlockEntity.java

@@ -18,11 +18,11 @@
 public class ModernBlockEntity implements BlockEntity.Factory {
   @Override
   public BlockEntity spawnBlockEntity(
-      Location loc, BlockMaterialData blockMaterialData, float size, Vector velocity) {
-    Location corrected = loc.clone();
+      Location center, BlockMaterialData blockMaterialData, float size, Vector velocity) {
+    Location corrected = center.clone();
     corrected.setPitch(0);
     corrected.setYaw(0);
-    final BlockDisplay entity = loc.getWorld().spawn(corrected, BlockDisplay.class);
+    final BlockDisplay entity = center.getWorld().spawn(corrected, BlockDisplay.class);
     entity.setBlock(((ModernBlockMaterialData) blockMaterialData).getBlock());
     entity.setTeleportDuration(1);
 
@@ -31,8 +31,8 @@ public BlockEntity spawnBlockEntity(
 
     final Matrix4f rotationMatrix = new Matrix4f();
     final Quaternionf rotation = new Quaternionf();
-    rotation.rotateLocalX((float) Math.toRadians(-loc.getPitch()));
-    rotation.rotateLocalY((float) Math.toRadians(180 - loc.getYaw()));
+    rotation.rotateLocalX((float) Math.toRadians(-center.getPitch()));
+    rotation.rotateLocalY((float) Math.toRadians(180 - center.getYaw()));
     rotation.get(rotationMatrix);
 
     final Matrix4f scaleMatrix = new Matrix4f().scale(size);
@@ -44,12 +44,8 @@ public BlockEntity spawnBlockEntity(
 
   private record Impl(Entity entity) implements BlockEntity {
 
-    public Location getLocation() {
-      return entity.getLocation();
-    }
-
-    public void teleport(Location loc) {
-      entity.teleport(loc);
+    public void teleport(Location center) {
+      entity.teleport(center);
     }
 
     @Override

platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/impl/ModernNMSHacks.java

@@ -61,7 +61,6 @@
 import org.bukkit.craftbukkit.entity.CraftFirework;
 import org.bukkit.craftbukkit.generator.CraftWorldInfo;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-import org.bukkit.entity.BlockDisplay;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Firework;
@@ -451,9 +450,4 @@ public int getMaxWorldSize(World world) {
   public int allocateEntityId() {
     return Bukkit.getUnsafe().nextEntityId();
   }
-
-  @Override
-  public boolean isBlockDisplayEntity(Class<? extends Entity> entity) {
-    return entity.isAssignableFrom(BlockDisplay.class);
-  }
 }

platform/platform-sportpaper/src/main/java/tc/oc/pgm/platform/sportpaper/entities/SpBlockEntity.java

@@ -0,0 +1,59 @@
+package tc.oc.pgm.platform.sportpaper.entities;
+
+import static tc.oc.pgm.util.platform.Supports.Variant.SPORTPAPER;
+
+import net.minecraft.server.v1_8_R3.EntityArmorStand;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArmorStand;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftFallingSand;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.util.Vector;
+import tc.oc.pgm.util.bukkit.entities.BlockEntity;
+import tc.oc.pgm.util.material.BlockMaterialData;
+import tc.oc.pgm.util.platform.Supports;
+
+@Supports(SPORTPAPER)
+public class SpBlockEntity implements BlockEntity.Factory {
+  // We use a falling sand entity, which is 1 block high, so we want to lower actual positon by half
+  // of that
+  private static final double OFFSET = 0.5d;
+
+  @Override
+  public BlockEntity spawnBlockEntity(
+      Location center, BlockMaterialData blockMaterialData, float size, Vector velocity) {
+    center.setY(center.getY() - OFFSET);
+    var fallingBlock = blockMaterialData.spawnFallingBlock(center);
+    var stand = center.getWorld().spawn(center, ArmorStand.class);
+    stand.setCustomNameVisible(false);
+    stand.setVisible(false);
+    stand.setMarker(true);
+    stand.setBasePlate(false);
+    stand.setGravity(false);
+    stand.setPassenger(fallingBlock);
+
+    // Reset the original location
+    center.setY(center.getY() + OFFSET);
+
+    var nmsStand = ((CraftArmorStand) stand).getHandle();
+    var nmsFallingSand = ((CraftFallingSand) fallingBlock).getHandle();
+    // Noclip makes movement ignore all collisions (faster), which we don't need as we run our own
+    nmsStand.noclip = true;
+    nmsFallingSand.noclip = true;
+
+    return new Impl(stand, nmsStand);
+  }
+
+  private record Impl(ArmorStand bukkit, EntityArmorStand nms) implements BlockEntity {
+    @Override
+    public void teleport(Location l) {
+      // We NEED to use NMS move because bukkit's teleport does not work on entities with passengers
+      nms.move(l.getX() - nms.locX, l.getY() - nms.locY - OFFSET, l.getZ() - nms.locZ);
+    }
+
+    @Override
+    public void remove() {
+      bukkit.getPassenger().remove();
+      bukkit.remove();
+    }
+  }
+}

platform/platform-sportpaper/src/main/java/tc/oc/pgm/platform/sportpaper/entities/SpCustomEntities.java

@@ -225,9 +225,4 @@ public int getMaxWorldSize(World world) {
   public int allocateEntityId() {
     return Bukkit.allocateEntityId();
   }
-
-  @Override
-  public boolean isBlockDisplayEntity(Class<? extends Entity> entity) {
-    return false;
-  }
 }

platform/platform-sportpaper/src/main/java/tc/oc/pgm/platform/sportpaper/impl/SpNMSHacks.java

@@ -5,22 +5,26 @@
 import tc.oc.pgm.util.material.BlockMaterialData;
 import tc.oc.pgm.util.platform.Platform;
 
+/**
+ * Implements a wrapper for block-like entities, used for projectiles. Modern implementations will
+ * use display entities, legacy (1.8) will use falling sand. <br>
+ *
+ * @implNote For this class, location is actually the center of the entity
+ */
 public interface BlockEntity {
   BlockEntity.Factory FACTORY = Platform.get(BlockEntity.Factory.class);
 
   static BlockEntity spawnBlockEntity(
-      Location loc, BlockMaterialData blockMaterialData, float size, Vector velocity) {
-    return FACTORY.spawnBlockEntity(loc, blockMaterialData, size, velocity);
+      Location center, BlockMaterialData blockMaterialData, float size, Vector velocity) {
+    return FACTORY.spawnBlockEntity(center, blockMaterialData, size, velocity);
   }
 
-  Location getLocation();
-
-  void teleport(Location loc);
+  void teleport(Location center);
 
   void remove();
 
   interface Factory {
     BlockEntity spawnBlockEntity(
-        Location loc, BlockMaterialData blockMaterialData, float size, Vector velocity);
+        Location center, BlockMaterialData blockMaterialData, float size, Vector velocity);
   }
 }