project: merge upstream

This commit is contained in:
Owain van Brakel
2019-10-30 04:22:38 +01:00
parent 13fc1f6554
commit 2655654c9f
23 changed files with 206 additions and 141 deletions

View File

@@ -260,7 +260,7 @@ public class NpcStatsDumper
private static boolean isAttackableNpc(final NpcDefinition n)
{
for (final String s : n.getOptions())
for (final String s : n.getActions())
{
if ("attack".equalsIgnoreCase(s))
{