Merge remote-tracking branch 'origin/master' into Fixes2

This commit is contained in:
CharonInferar
2014-08-17 13:30:28 +02:00
38 changed files with 1868 additions and 2944 deletions
+3 -3
View File
@@ -906,11 +906,11 @@ public class CombatService implements INetworkDispatch {
private boolean attemptCombat(CreatureObject attacker, TangibleObject target) {
if (attacker.isInStealth()) {
attacker.setInStealth(false);
if (attacker.isCloaked()) {
attacker.setCloaked(false);
if (attacker.getPlayerObject() != null && attacker.getPlayerObject().getProfession().equals("spy_1a")) {
attacker.setRadarVisible(true);
attacker.setVisibleOnRadar(true);
}
}