Cleanup

AtlasEngineCa · Jun 8, 2022 · 712e6bf · 712e6bf
1 parent a97979b
commit 712e6bf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/net/worldseed/multipart/GenericModel.java b/src/main/java/net/worldseed/multipart/GenericModel.java
@@ -2,7 +2,6 @@
 
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.entity.Entity;
-import net.minestom.server.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Set;
@@ -68,7 +67,7 @@ public interface GenericModel {
 
     void mountEntity(Entity entity);
     void dismountEntity(Entity entity);
-    Set<Entity> getPassenger();
+    Set<Entity> getPassengers();
 
     /**
      * Get a VFX bone location

diff --git a/src/main/java/net/worldseed/multipart/GenericModelImpl.java b/src/main/java/net/worldseed/multipart/GenericModelImpl.java
@@ -124,7 +124,7 @@ public void dismountEntity(Entity e) {
             this.seat.getEntity().removePassenger(e);
     }
 
-    public Set<Entity> getPassenger() {
+    public Set<Entity> getPassengers() {
         return this.seat.getEntity().getPassengers();
     }
 

diff --git a/src/test/java/GemGolem/GemGolemMob.java b/src/test/java/GemGolem/GemGolemMob.java
@@ -72,7 +72,7 @@ public GemGolemMob(Instance instance, Pos pos) {
     private void facePlayer() {
         Entity target = this.getTarget();
         if (target == null) return;
-        if (getRider().contains(target)) return;
+        if (getPassengers().contains(target)) return;
 
         Point e = this.position.sub(target.getPosition());
         model.setGlobalRotation(-PositionUtils.getLookYaw(e.x(), e.z()) + 180);
@@ -117,7 +117,8 @@ public boolean isSleeping() {
         return sleeping;
     }
 
-    public Set<Entity> getRider() {
-        return model.getPassenger();
+    @Override
+    public @NotNull Set<Entity> getPassengers() {
+        return model.getPassengers();
     }
 }
diff --git a/src/test/java/GemGolem/GemGolemMoveGoal.java b/src/test/java/GemGolem/GemGolemMoveGoal.java
@@ -29,7 +29,7 @@ public GemGolemMoveGoal(@NotNull GemGolemMob entityCreature, AnimationHandler ha
     public boolean shouldStart() {
         target = findTarget();
         if (target == null) return false;
-        if (((GemGolemMob)entityCreature).getRider().contains(target)) return false;
+        if (entityCreature.getPassengers().contains(target)) return false;
         if (((GemGolemMob)entityCreature).isSleeping()) return false;
         if (!this.animationHandler.getPlaying().equals("idle_extended")) return false;
 
@@ -78,7 +78,7 @@ public boolean shouldEnd() {
                 || target.isRemoved()
                 || entityCreature.getDistance(target) >= maxDistance
                 || entityCreature.getDistance(target) <= minDistance
-                || (((GemGolemMob)entityCreature).getRider().contains(target))
+                || (((GemGolemMob)entityCreature).getPassengers().contains(target))
                 || !this.animationHandler.getPlaying().equals("walk");
     }