From 83e8b59e51f112dc22a3feea4ddadf61bf705ed2 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Mon, 16 Jun 2014 23:30:20 +0100
Subject: [PATCH] Temporary command error fix

---
 src/services/command/CommandService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 9c511792..aa514a51 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -492,6 +492,9 @@ public class CommandService implements INetworkDispatch  {
 		else
 			weapon = (WeaponObject) core.objectService.getObject(attacker.getWeaponId());
 		
+		if(weapon == null)
+			weapon = (WeaponObject) attacker.getSlottedObject("default_weapon");
+		
 		float maxRange = 0;
 		
 		if(command.getMaxRange() == 0)