lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed RequestClanAskJoinByName not working.

Browse Source
This commit is contained in:
MobiusDev 2019-02-06 05:38:46 +00:00
parent 35e51e1fb4
commit 9d6641922f
20 changed files with 190 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}

19
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
}
else
{
if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
{
return; // hax
}
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final int pledgeType;
if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
{
pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
}
else
{
pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
}
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
{
if (activeChar.getClan() != null)
{
@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
activeChar.setPledgeType(requestPacket.getPledgeType());
if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
activeChar.setPledgeType(pledgeType);
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
{
activeChar.setPowerGrade(9); // academy
activeChar.setLvlJoinedAcademy(activeChar.getLevel());

5
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
}
public int getPledgeType()
{
return _pledgeType;
}
}