fix hoop intersection

Author: gegy1000

src/main/java/io/github/restioson/loopdeloop/game/LoopDeLoopActive.java

@@ -7,16 +7,9 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.projectile.FireworkRocketEntity;
-import net.minecraft.world.World;
-import xyz.nucleoid.plasmid.game.GameWorld;
-import xyz.nucleoid.plasmid.game.event.*;
-import xyz.nucleoid.plasmid.game.player.JoinResult;
-import xyz.nucleoid.plasmid.game.rule.GameRule;
-import xyz.nucleoid.plasmid.game.rule.RuleResult;
-import xyz.nucleoid.plasmid.util.ItemStackBuilder;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.projectile.FireworkRocketEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.network.packet.s2c.play.TitleS2CPacket;
@@ -35,8 +28,26 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameMode;
+import xyz.nucleoid.plasmid.game.GameWorld;
+import xyz.nucleoid.plasmid.game.event.GameCloseListener;
+import xyz.nucleoid.plasmid.game.event.GameOpenListener;
+import xyz.nucleoid.plasmid.game.event.GameTickListener;
+import xyz.nucleoid.plasmid.game.event.OfferPlayerListener;
+import xyz.nucleoid.plasmid.game.event.PlayerAddListener;
+import xyz.nucleoid.plasmid.game.event.PlayerDamageListener;
+import xyz.nucleoid.plasmid.game.event.PlayerDeathListener;
+import xyz.nucleoid.plasmid.game.event.PlayerRemoveListener;
+import xyz.nucleoid.plasmid.game.player.JoinResult;
+import xyz.nucleoid.plasmid.game.rule.GameRule;
+import xyz.nucleoid.plasmid.game.rule.RuleResult;
+import xyz.nucleoid.plasmid.util.ItemStackBuilder;
+
 import javax.annotation.Nullable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public final class LoopDeLoopActive {
     private final GameWorld gameWorld;
@@ -259,7 +270,7 @@ private void tickPlayers(long time) {
             //
             // If they are moving slow, there may not be enough precision to detect this, so the slow path is fallen back
             // to, simply checking if the end coordinate is inside of the hoop.
-            if (hoop.intersectsSegment(state.lastPos, player.getPos()) || hoop.contains(player.getBlockPos())) {
+            if (hoop.intersectsSegment(state.lastPos, player.getPos())) {
                 player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 1.0F, 1.0F);
                 giveRocket(player, 1);
                 state.lastHoop += 1;

src/main/java/io/github/restioson/loopdeloop/game/map/LoopDeLoopHoop.java

@@ -1,6 +1,7 @@
 package io.github.restioson.loopdeloop.game.map;
 
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 
 import javax.annotation.Nullable;
@@ -15,25 +16,36 @@ public LoopDeLoopHoop(BlockPos centre, int radius) {
     }
 
     public boolean intersectsSegment(Vec3d begin, Vec3d end) {
-        Vec3d intersection = lineIntersectsPlane(begin, end, centre.getZ() + 0.5);
+        // if we contain the end position, we are inside the hoop
+        if (this.contains(end)) {
+            return true;
+        }
 
+        // find the intersection between the line and the hoop plane
+        Vec3d intersection = lineIntersectsPlane(begin, end, centre.getZ() + 0.5);
         if (intersection == null) {
-            return false; // No intersection - line parallel
+            // no intersection
+            return false;
         }
 
-        // radius - 1 is to avoid allowing people to go on top of corners
-        return this.contains(new BlockPos(intersection));
+        // check if the intersection point is contained within the loop
+        return this.contains(intersection.x, intersection.y);
+    }
+
+    public boolean contains(Vec3d pos) {
+        return MathHelper.floor(pos.getZ()) == this.centre.getZ()
+                && this.contains(pos.getX(), pos.getY());
     }
 
-    public boolean contains(BlockPos pos) {
+    private boolean contains(double x, double y) {
         int adjRadius = this.radius - 1; // radius - 1 is to avoid allowing people to go on top of corners
-        int dx = pos.getX() - this.centre.getX();
-        int dy = pos.getY() - this.centre.getY();
-        return pos.getZ() == this.centre.getZ() && (dx * dx + dy * dy <= adjRadius * adjRadius);
+        int dx = MathHelper.floor(x) - this.centre.getX();
+        int dy = MathHelper.floor(y) - this.centre.getY();
+        return dx * dx + dy * dy <= adjRadius * adjRadius;
     }
 
     @Nullable
-    public static Vec3d lineIntersectsPlane(Vec3d origin, Vec3d target, double planeZ) {
+    private static Vec3d lineIntersectsPlane(Vec3d origin, Vec3d target, double planeZ) {
         Vec3d ray = target.subtract(origin);
         if (Math.abs(ray.z) <= 1e-5) {
             return null;