mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-04 14:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IntermediateBuffer

Browse Source
This commit is contained in:
dfsek
2020-12-25 17:46:22 -07:00
parent a18d459343
commit 9685dbbb9d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java
View File

@@ -1,5 +1,6 @@
package com.dfsek.terra.api.structures.script.functions;
import com.dfsek.terra.api.math.vector.Location;
import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.math.vector.Vector3;
import com.dfsek.terra.api.platform.TerraPlugin;
@@ -32,12 +33,12 @@ public class CheckFunction implements Function<String> {
return "check";
}
private Vector3 getVector(Buffer buffer, Rotation rotation, int recursions) {
private Location getVector(Buffer buffer, Rotation rotation, int recursions) {
Vector2 xz = new Vector2(x.apply(buffer, rotation, recursions).doubleValue(), z.apply(buffer, rotation, recursions).doubleValue());
RotationUtil.rotateVector(xz, rotation);
return new Vector3(FastMath.roundToInt(xz.getX()), y.apply(buffer, rotation, recursions).intValue(), FastMath.roundToInt(xz.getZ())).add(buffer.getOrigin().toVector());
return buffer.getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(buffer, rotation, recursions).intValue(), FastMath.roundToInt(xz.getZ())));
}
@Override
@@ -45,7 +46,7 @@ public class CheckFunction implements Function<String> {
return apply(getVector(buffer, rotation, recursions), buffer.getOrigin().getWorld());
}
private String apply(Vector3 vector, World world) {
private String apply(Location vector, World world) {
if(new LandCheck(world, main).check(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ()))
return "LAND";
if(new OceanCheck(world, main).check(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ()))

2
common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java
View File

@@ -21,7 +21,7 @@ public class IntermediateBuffer implements Buffer {
@Override
public Location getOrigin() {
return original.getOrigin().add(offset);
return original.getOrigin().clone().add(offset);
}
@Override

2
common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java
View File

@@ -48,6 +48,6 @@ public class StructureBuffer implements Buffer {
@Override
public Location getOrigin() {
return origin;
return origin.clone();
}
}