diff --git a/src/api b/src/api index 2fc048b93..748939619 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 2fc048b93e0f58ea59a4c7f943b7b46a98d42ee9 +Subproject commit 7489396198dde521e5b79eaecb2aeac9ca6e9862 diff --git a/src/main/java/noppes/npcs/scripted/BlockScriptedWrapper.java b/src/main/java/noppes/npcs/scripted/BlockScriptedWrapper.java index 33b97e4c1..6c6b81605 100644 --- a/src/main/java/noppes/npcs/scripted/BlockScriptedWrapper.java +++ b/src/main/java/noppes/npcs/scripted/BlockScriptedWrapper.java @@ -81,12 +81,24 @@ public class BlockScriptedWrapper extends ScriptBlock implements IBlockScripted{ @Override public void setIsPassible(boolean bo){ + setIsPassable(bo); + } + + @Override + public boolean getIsPassible(){ + return getIsPassable(); + } + + @Override + public void setIsPassable(boolean bo){ tile.isPassible = bo; tile.needsClientUpdate = true; } @Override - public boolean getIsPassible(){ + public boolean getIsPassable(){ + if(tile == null) + return false; return tile.isPassible; } @@ -97,6 +109,8 @@ public class BlockScriptedWrapper extends ScriptBlock implements IBlockScripted{ @Override public int getLight(){ + if(tile == null) + return 0; return tile.lightValue; }