Merge pull request #1172 from ProjectSWGCore/CreatureObjectRefactor

Creature object refactor
This commit is contained in:
Waverunner
2014-08-16 22:21:15 -04:00
26 changed files with 1813 additions and 2921 deletions
+1 -3
View File
@@ -23,8 +23,6 @@ package services.command;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteOrder;
import java.util.Map;
@@ -36,7 +34,6 @@ import java.util.concurrent.ScheduledExecutorService;
import main.NGECore;
import org.apache.commons.io.FileUtils;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
@@ -536,6 +533,7 @@ public class CommandService implements INetworkDispatch {
TangibleObject targetObject = (TangibleObject) target;
// FIXME Attacks will work on allies without this
// if (!targetObject.isAttackableBy(actor)) {
// return false;
// }