From b36ccc137f3a0f40c004c5bed9d519f676ed6f8d Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 21 Jul 2020 12:10:41 -0300 Subject: [PATCH 1/2] fixed issue with command events --- src/main/java/carpet/script/CarpetEventServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index 8ccf25be..ed661156 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -193,7 +193,7 @@ public class CarpetEventServer public void removeEventCall(String hostName, String funName) { - callList.removeIf((c)-> c.function.getString().equals(funName) && ( hostName == null || c.host.equalsIgnoreCase(hostName) ) ); + callList.removeIf((c)-> c.function.getString().equals(funName) && ( hostName == c.host || (c.host != null && c.host.equalsIgnoreCase(hostName) )) ); } public void removeAllCalls(String hostName) From 5ed55ecf9e07bdcb98b803a4c845771f68c3c08f Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 21 Jul 2020 12:44:07 -0300 Subject: [PATCH 2/2] spawned test entity below bedrock --- src/main/java/carpet/commands/PerimeterInfoCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/commands/PerimeterInfoCommand.java b/src/main/java/carpet/commands/PerimeterInfoCommand.java index 27b80b45..980b6c03 100644 --- a/src/main/java/carpet/commands/PerimeterInfoCommand.java +++ b/src/main/java/carpet/commands/PerimeterInfoCommand.java @@ -53,7 +53,7 @@ public class PerimeterInfoCommand { nbttagcompound.putString("id", mobId); Entity baseEntity = EntityType.loadEntityWithPassengers(nbttagcompound, source.getWorld(), (entity_1x) -> { - entity_1x.refreshPositionAndAngles(pos.offset(Direction.UP,2), entity_1x.yaw, entity_1x.pitch); + entity_1x.refreshPositionAndAngles(new BlockPos(pos.getX(), -10, pos.getZ()), entity_1x.yaw, entity_1x.pitch); return !source.getWorld().tryLoadEntity(entity_1x) ? null : entity_1x; }); if (!(baseEntity instanceof MobEntity))