diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java index bf9e4eb66a..e5a0073933 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java @@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -604,14 +604,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java index bf9e4eb66a..e5a0073933 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java @@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -604,14 +604,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java index bf9e4eb66a..e5a0073933 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java @@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -604,14 +604,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java index 1540382051..baf99256e4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java @@ -97,7 +97,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -603,14 +603,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java index 1785940060..5c05545dab 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java @@ -98,7 +98,7 @@ public class Party extends AbstractPlayerGroup private Future _positionBroadcastTask = null; protected PartyMemberPosition _positionPacket; private boolean _disbanding = false; - private static Map _tacticalSigns = null; + private Map _tacticalSigns = null; private static final int[] TACTICAL_SYS_STRINGS = { 0, @@ -605,14 +605,18 @@ public class Party extends AbstractPlayerGroup } } - if (getLeader() != null) + final PlayerInstance leader = getLeader(); + if (leader != null) { - getLeader().setParty(null); - if (getLeader().isInDuel()) + applyTacticalSigns(leader, true); + + leader.setParty(null); + if (leader.isInDuel()) { - DuelManager.getInstance().onRemoveFromParty(getLeader()); + DuelManager.getInstance().onRemoveFromParty(leader); } } + if (_changeDistributionTypeRequestTask != null) { _changeDistributionTypeRequestTask.cancel(true);