Fixed tactical signs.
Contributed by Sahar.
This commit is contained in:
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -604,14 +604,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -604,14 +604,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -604,14 +604,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -603,14 +603,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup
|
|||||||
private Future<?> _positionBroadcastTask = null;
|
private Future<?> _positionBroadcastTask = null;
|
||||||
protected PartyMemberPosition _positionPacket;
|
protected PartyMemberPosition _positionPacket;
|
||||||
private boolean _disbanding = false;
|
private boolean _disbanding = false;
|
||||||
private static Map<Integer, Creature> _tacticalSigns = null;
|
private Map<Integer, Creature> _tacticalSigns = null;
|
||||||
private static final int[] TACTICAL_SYS_STRINGS =
|
private static final int[] TACTICAL_SYS_STRINGS =
|
||||||
{
|
{
|
||||||
0,
|
0,
|
||||||
@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getLeader() != null)
|
final PlayerInstance leader = getLeader();
|
||||||
|
if (leader != null)
|
||||||
{
|
{
|
||||||
getLeader().setParty(null);
|
applyTacticalSigns(leader, true);
|
||||||
if (getLeader().isInDuel())
|
|
||||||
|
leader.setParty(null);
|
||||||
|
if (leader.isInDuel())
|
||||||
{
|
{
|
||||||
DuelManager.getInstance().onRemoveFromParty(getLeader());
|
DuelManager.getInstance().onRemoveFromParty(leader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_changeDistributionTypeRequestTask != null)
|
if (_changeDistributionTypeRequestTask != null)
|
||||||
{
|
{
|
||||||
_changeDistributionTypeRequestTask.cancel(true);
|
_changeDistributionTypeRequestTask.cancel(true);
|
||||||
|
Reference in New Issue
Block a user