Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Beny 2019-05-16 12:41:29 +01:00
commit 0823b606d9

View File

@ -119,7 +119,7 @@ public class WiredEffectTriggerStacks extends InteractionWiredEffect
@Override
public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff)
{
if (stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks)
if (stuff != null && stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks)
{
return false;
}