projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity

Fixed some merge issues with creature refactor.

Browse Source
This commit is contained in:
Treeku
2014-08-16 23:02:01 +01:00
parent e5d4a633bf
commit 231a476441
10 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+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;
@@ -534,6 +531,7 @@ public class CommandService implements INetworkDispatch {
TangibleObject targetObject = (TangibleObject) target;
// FIXME Attacks will work on allies without this
// if (!targetObject.isAttackableBy(actor)) {
// return false;
// }