Fixed missing blocks

Minecraft-Ships · Jan 28, 2024 · a7d051d · a7d051d
1 parent 0fbdfac
commit a7d051d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/main/java/org/ships/vessel/structure/AbstractPositionableShipsStructure.java b/src/main/java/org/ships/vessel/structure/AbstractPositionableShipsStructure.java
@@ -112,17 +112,17 @@ public CompletableFuture<PositionableShipsStructure> fillAir() {
                             .setDelay(0)
                             .setDelayUnit(TimeUnit.MINECRAFT_TICKS)
                             .setRunner((s) -> future.complete(this))
-                            .build(ShipsPlugin.getPlugin())
+                            .buildDelayed(ShipsPlugin.getPlugin())
                             .run();
                 }))
-                .build(ShipsPlugin.getPlugin())
+                .buildDelayed(ShipsPlugin.getPlugin())
                 .run();
         return future;
     }
 
     @Override
     public Collection<Vector3<Integer>> getOutsidePositionsRelativeToCenter() {
-        Collection<Vector3<Integer>> vectors = new HashSet<>(this.getOriginalRelativePositionsToCenter());
+        Collection<Vector3<Integer>> vectors = new HashSet<>(this.getOriginalRelativeVectorsToCenter());
         if (vectors.stream().noneMatch(v -> v.equals(Vector3.valueOf(0, 0, 0)))) {
             vectors.add(Vector3.valueOf(0, 0, 0));
         }
@@ -172,7 +172,16 @@ public Bounds<Integer> getBounds() {
     }
 
     @Override
-    public Collection<Vector3<Integer>> getOriginalRelativePositionsToCenter() {
+    public Collection<Vector3<Integer>> getOriginalRelativeVectorsToWorld() {
+        return this
+                .getOriginalRelativeVectorsToCenter()
+                .parallelStream()
+                .map(vector -> this.position.getPosition().plus(vector))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public Collection<Vector3<Integer>> getOriginalRelativeVectorsToCenter() {
         return this.vectors;
     }
 
@@ -261,7 +270,8 @@ public boolean removePositionRelativeToCenter(@NotNull Vector3<Integer> remove)
 
     @Override
     public void copyFrom(@NotNull PositionableShipsStructure structure) {
-        if (structure instanceof AbstractPositionableShipsStructure && this.isEmpty()) {
+        if (structure instanceof AbstractPositionableShipsStructure && this.isEmpty() && this.position.equals(
+                structure.getPosition())) {
             AbstractPositionableShipsStructure abstractStructure = (AbstractPositionableShipsStructure) structure;
             this.cachedBounds = abstractStructure.cachedBounds;
             this.vectors.addAll(abstractStructure.vectors);
@@ -271,7 +281,7 @@ public void copyFrom(@NotNull PositionableShipsStructure structure) {
             this.outsideWest.addAll(abstractStructure.outsideWest);
             return;
         }
-        structure.getRelativePositionsToCenter().parallelStream().forEach(this::addPositionRelativeToCenter);
+        structure.getOriginalRelativeVectorsToWorld().parallelStream().forEach(this::addPositionRelativeToWorld);
     }
 
     @Override

diff --git a/src/main/java/org/ships/vessel/structure/PositionableShipsStructure.java b/src/main/java/org/ships/vessel/structure/PositionableShipsStructure.java
@@ -80,7 +80,14 @@ default Collection<Vector3<Integer>> getRelativePositions() {
         return this.getRelativePositionsToCenter();
     }
 
-    Collection<Vector3<Integer>> getOriginalRelativePositionsToCenter();
+    @Deprecated(forRemoval = true)
+    default Collection<Vector3<Integer>> getOriginalRelativePositionsToCenter() {
+        return getOriginalRelativeVectorsToCenter();
+    }
+
+    Collection<Vector3<Integer>> getOriginalRelativeVectorsToWorld();
+
+    Collection<Vector3<Integer>> getOriginalRelativeVectorsToCenter();
 
     @Deprecated(forRemoval = true)
     default Collection<Vector3<Integer>> getOriginalRelativePositions() {