Merge pull request #62 from PZDonny/develop

Fix parts appearing at incorrect position, again...

Author: PZDonny

api/src/main/java/net/donnypz/displayentityutils/utils/DisplayEntities/PacketDisplayEntityGroup.java

@@ -853,7 +853,7 @@ public void setAutoShowCondition(@Nullable Predicate<Player> playerCondition){
      */
     @Override
     public void showToPlayer(@NotNull Player player, @NotNull GroupSpawnedEvent.SpawnReason spawnReason) {
-        showToPlayer(player, spawnReason, getLocation());
+        showToPlayers(List.of(player), spawnReason);
     }
 
     /**
@@ -864,14 +864,7 @@ public void showToPlayer(@NotNull Player player, @NotNull GroupSpawnedEvent.Spaw
      */
     @Override
     public void showToPlayer(@NotNull Player player, GroupSpawnedEvent.@NotNull SpawnReason spawnReason, @NotNull Location location) {
-        if (!sendShowEvent(List.of(player), spawnReason)) return;
-        if (!masterPart.isTrackedBy(player)){
-            for (PacketDisplayEntityPart part : groupParts.values()){
-                part.showToPlayer(player, spawnReason, location);
-            }
-            setPassengers(player);
-        }
-        refreshVehicle(player);
+        showToPlayers(List.of(player), spawnReason, location);
     }
 
     /**

api/src/main/java/net/donnypz/displayentityutils/utils/DisplayEntities/PacketDisplayEntityPart.java

@@ -159,6 +159,10 @@ public void showToPlayer(@NotNull Player player, GroupSpawnedEvent.@NotNull Spaw
             return;
         }
         DEUUser.getOrCreateUser(player).trackPacketEntity(this);
+        if (type == SpawnedDisplayEntityPart.PartType.INTERACTION && hasGroup()){
+            Vector translation = getInteractionTranslation(group.getLocation());
+            location = location.clone().add(translation);
+        }
         attributeContainer.sendEntity(type, getEntityId(), player, location);
     }
 
@@ -204,6 +208,10 @@ public void showToPlayers(@NotNull Collection<Player> players, GroupSpawnedEvent
                 DEUUser.getOrCreateUser(player).trackPacketEntity(this);
             }
         }
+        if (type == SpawnedDisplayEntityPart.PartType.INTERACTION && hasGroup()){
+            Vector translation = getInteractionTranslation(group.getLocation());
+            location = location.clone().add(translation);
+        }
         attributeContainer.sendEntityUsingPlayers(type, getEntityId(), plrs, location);
     }