Fixed tactical signs.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2020-06-28 00:06:17 +00:00
parent 5b874ebb25
commit a3a76a85a0
15 changed files with 135 additions and 75 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);