diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 5ce3195542..ddac4048a1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -490,9 +490,9 @@ public class ClanTable public void checkSurrender(Clan clan1, Clan clan2) { int count = 0; - for (ClanMember player : clan1.getMembers()) + for (ClanMember member : clan1.getMembers()) { - if ((player != null) && (player.getPlayer().getWantsPeace() == 1)) + if ((member != null) && (member.getPlayer().getWantsPeace() == 1)) { count++; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 18ad33782a..eab7782a29 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -57,19 +57,19 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket _isOnline = _player.isOnline() ? _player.getObjectId() : 0; } - public PledgeShowMemberListUpdate(ClanMember player) + public PledgeShowMemberListUpdate(ClanMember member) { - _player = player.getPlayer(); - _name = player.getName(); - _level = player.getLevel(); - _classId = player.getClassId(); - _isOnline = player.isOnline() ? player.getObjectId() : 0; - _pledgeType = player.getPledgeType(); + _player = member.getPlayer(); + _name = member.getName(); + _level = member.getLevel(); + _classId = member.getClassId(); + _isOnline = member.isOnline() ? member.getObjectId() : 0; + _pledgeType = member.getPledgeType(); if (_pledgeType == Clan.SUBUNIT_ACADEMY) { _hasSponsor = _player.getSponsor() != 0 ? 1 : 0; } - else if (player.isOnline()) + else if (member.isOnline()) { _hasSponsor = _player.isClanLeader() ? 1 : 0; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 5ce3195542..ddac4048a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -490,9 +490,9 @@ public class ClanTable public void checkSurrender(Clan clan1, Clan clan2) { int count = 0; - for (ClanMember player : clan1.getMembers()) + for (ClanMember member : clan1.getMembers()) { - if ((player != null) && (player.getPlayer().getWantsPeace() == 1)) + if ((member != null) && (member.getPlayer().getWantsPeace() == 1)) { count++; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 18ad33782a..eab7782a29 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -57,19 +57,19 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket _isOnline = _player.isOnline() ? _player.getObjectId() : 0; } - public PledgeShowMemberListUpdate(ClanMember player) + public PledgeShowMemberListUpdate(ClanMember member) { - _player = player.getPlayer(); - _name = player.getName(); - _level = player.getLevel(); - _classId = player.getClassId(); - _isOnline = player.isOnline() ? player.getObjectId() : 0; - _pledgeType = player.getPledgeType(); + _player = member.getPlayer(); + _name = member.getName(); + _level = member.getLevel(); + _classId = member.getClassId(); + _isOnline = member.isOnline() ? member.getObjectId() : 0; + _pledgeType = member.getPledgeType(); if (_pledgeType == Clan.SUBUNIT_ACADEMY) { _hasSponsor = _player.getSponsor() != 0 ? 1 : 0; } - else if (player.isOnline()) + else if (member.isOnline()) { _hasSponsor = _player.isClanLeader() ? 1 : 0; } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index a25a5a84f3..50eda636bd 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -428,9 +428,9 @@ public class ClanTable public void checkSurrender(Clan clan1, Clan clan2) { int count = 0; - for (ClanMember player : clan1.getMembers()) + for (ClanMember member : clan1.getMembers()) { - if ((player != null) && (player.getPlayer().getWantsPeace() == 1)) + if ((member != null) && (member.getPlayer().getWantsPeace() == 1)) { count++; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index c1ffa55802..a186044888 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -451,9 +451,9 @@ public class ClanTable public void checkSurrender(Clan clan1, Clan clan2) { int count = 0; - for (ClanMember player : clan1.getMembers()) + for (ClanMember member : clan1.getMembers()) { - if ((player != null) && (player.getPlayer().getWantsPeace() == 1)) + if ((member != null) && (member.getPlayer().getWantsPeace() == 1)) { count++; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index c1ffa55802..a186044888 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -451,9 +451,9 @@ public class ClanTable public void checkSurrender(Clan clan1, Clan clan2) { int count = 0; - for (ClanMember player : clan1.getMembers()) + for (ClanMember member : clan1.getMembers()) { - if ((player != null) && (player.getPlayer().getWantsPeace() == 1)) + if ((member != null) && (member.getPlayer().getWantsPeace() == 1)) { count++; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 2090dd966a..f88c978dc6 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -55,22 +55,5 @@ public class CannotMoveAnymore implements IClientIncomingPacket { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); } - /* - * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); } - */ - - // player.stopMove(); - // - // if (Config.DEBUG) - // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ - // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); - // StopMove smwl = new StopMove(player); - // player.getPlayer().sendPacket(smwl); - // player.getPlayer().broadcastPacket(smwl); - // - // StopRotation sr = new StopRotation(player.getPlayer(), - // _heading); - // player.getPlayer().sendPacket(sr); - // player.getPlayer().broadcastPacket(sr); } }