icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.16

Browse Source
This commit is contained in:
gnembon committed 2020-07-21 12:45:07 -03:00
2 parents 359b89b46f 5ed55ecf9e
commit 7b4c3f8add
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/commands/PerimeterInfoCommand.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class PerimeterInfoCommand
{ {
nbttagcompound.putString("id", mobId); nbttagcompound.putString("id", mobId);
Entity baseEntity = EntityType.loadEntityWithPassengers(nbttagcompound, source.getWorld(), (entity_1x) -> { 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; return !source.getWorld().tryLoadEntity(entity_1x) ? null : entity_1x;
}); });
if (!(baseEntity instanceof MobEntity)) if (!(baseEntity instanceof MobEntity))
src/main/java/carpet/script/CarpetEventServer.java
+1 -1
View File
@@ -195,7 +195,7 @@ public class CarpetEventServer
public void removeEventCall(String hostName, String funName) 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) public void removeAllCalls(String hostName)