From 87da83614652f1edac8399a3712e1223e8e648f6 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sat, 3 May 2014 06:17:34 +0100 Subject: [PATCH] Fixed tangibles in weapon-slot issue --- src/services/command/CommandService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java index cf14b35a..c778a25f 100644 --- a/src/services/command/CommandService.java +++ b/src/services/command/CommandService.java @@ -91,9 +91,9 @@ public class CommandService implements INetworkDispatch { return false; } - WeaponObject weapon = (WeaponObject) core.objectService.getObject(actor.getWeaponId()); + TangibleObject weapon = (TangibleObject) core.objectService.getObject(actor.getWeaponId()); - if (weapon != null && weapon.getWeaponType() == command.getInvalidWeapon()) { + if (weapon != null && weapon instanceof WeaponObject && ((WeaponObject) weapon).getWeaponType() == command.getInvalidWeapon()) { return false; }