Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-02 21:41:43 +01:00
Code Issues Projects Releases Wiki Activity

Simplify boundingbox api

Browse Source
This commit is contained in:
fullwall 2023-02-14 00:30:03 +08:00
parent c66a5b53ad
commit f64e28f2e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.trait;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Supplier;
import org.bukkit.Location;
@ -15,7 +15,7 @@ import net.citizensnpcs.api.util.EntityDim;
@TraitName("boundingbox")
public class BoundingBoxTrait extends Trait implements Supplier<BoundingBox> {
private EntityDim base;
private BiFunction<Location, EntityDim, BoundingBox> function;
private Function<EntityDim, BoundingBox> function;
@Persist
private float height = -1;
@Persist
@ -29,10 +29,10 @@ public class BoundingBoxTrait extends Trait implements Supplier<BoundingBox> {
@Override
public BoundingBox get() {
if (function != null) {
return function.apply(npc.getStoredLocation(), getAdjustedBoundingBox());
}
Location location = npc.getEntity().getLocation();
if (function != null) {
return function.apply(getAdjustedBoundingBox()).add(location);
}
EntityDim dim = getAdjustedBoundingBox();
return new BoundingBox(location.getX() - dim.width / 2, location.getY(), location.getZ() - dim.width / 2,
location.getX() + dim.width / 2, location.getY() + dim.height, location.getZ() + dim.width / 2);
@ -62,7 +62,7 @@ public class BoundingBoxTrait extends Trait implements Supplier<BoundingBox> {
npc.data().set(NPC.Metadata.BOUNDING_BOX_FUNCTION, this);
}
public void setBoundingBoxFunction(BiFunction<Location, EntityDim, BoundingBox> func) {
public void setBoundingBoxFunction(Function<EntityDim, BoundingBox> func) {
this.function = func;
}