add IWorld#removeEntity (#1422)

CraftTweaker · Dec 31, 2021 · 6bd6f22 · 6bd6f22
1 parent d5b0dc0
commit 6bd6f22
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CraftTweaker2-API/src/main/java/crafttweaker/api/world/IWorld.java b/CraftTweaker2-API/src/main/java/crafttweaker/api/world/IWorld.java
@@ -93,6 +93,11 @@ public interface IWorld extends IBlockAccess {
 
     @ZenMethod
     boolean spawnEntity(IEntity entity);
+
+    @ZenMethod
+    default void removeEntity(IEntity entity) {
+        CraftTweakerAPI.logError(this.getClass().getName() + " does not override IWorld.removeEntity, tell the author to fix that.");
+    }
 
     @ZenMethod
     default IRayTraceResult rayTraceBlocks(IVector3d begin, IVector3d ray, @Optional boolean stopOnLiquid, @Optional boolean ignoreBlockWithoutBoundingBox, @Optional(valueBoolean = true) boolean returnLastUncollidableBlock) {

diff --git a/CraftTweaker2-MC1120-Main/src/main/java/crafttweaker/mc1120/world/MCWorld.java b/CraftTweaker2-MC1120-Main/src/main/java/crafttweaker/mc1120/world/MCWorld.java
@@ -127,8 +127,13 @@ public Object getInternal() {
     public boolean spawnEntity(IEntity entity) {
         return world.spawnEntity(CraftTweakerMC.getEntity(entity));
     }
-
-    @Override
+
+	@Override
+	public void removeEntity(IEntity entity) {
+		world.removeEntity(CraftTweakerMC.getEntity(entity));
+	}
+
+	@Override
     public IRayTraceResult rayTraceBlocks(IVector3d begin, IVector3d ray, boolean stopOnLiquid, boolean ignoreBlockWithoutBoundingBox, boolean returnLastUncollidableBlock) {
         return CraftTweakerMC.getIRayTraceResult(this.world.rayTraceBlocks(CraftTweakerMC.getVec3d(begin), CraftTweakerMC.getVec3d(ray), stopOnLiquid, ignoreBlockWithoutBoundingBox, returnLastUncollidableBlock));
     }