New update.
Index: java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
===================================================================
--- java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java (working copy)
@@ -27,7 +27,7 @@
{
private int _messageId;
private int _answer;
- private int _requesterId;
+ // private int _requesterId;
@Override
protected void readImpl()
@@ -34,7 +34,7 @@
{
_messageId = readD();
_answer = readD();
- _requesterId = readD();
+ // _requesterId = readD();
}
@Override
@@ -46,21 +46,21 @@
return;
}
- final Long answerTime = player.getConfirmDlgRequestTime(_requesterId);
- if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime))
- {
- _answer = 0;
- }
- player.removeConfirmDlgRequestTime(_requesterId);
+ // final Long answerTime = player.getConfirmDlgRequestTime(_requesterId);
+ // if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime))
+ // {
+ // _answer = 0;
+ // }
+ // player.removeConfirmDlgRequestTime(_requesterId);
if (_messageId == SystemMessageId.S1_IS_MAKING_AN_ATTEMPT_AT_RESURRECTION_DO_YOU_WANT_TO_CONTINUE_WITH_THIS_RESURRECTION.getId())
{
player.reviveAnswer(_answer);
}
- else if (_messageId == SystemMessageId.S1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
- {
- player.teleportAnswer(_answer, _requesterId);
- }
+ // else if (_messageId == SystemMessageId.S1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
+ // {
+ // player.teleportAnswer(_answer, _requesterId);
+ // }
else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())
{
player.gatesAnswer(_answer, 1);
Index: java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
===================================================================
--- java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java (working copy)
@@ -70,6 +70,6 @@
sm.addString(player.getClan().getAllyName());
sm.addString(player.getName());
target.sendPacket(sm);
- target.sendPacket(new AskJoinAlly(player.getObjectId(), player.getClan().getAllyName()));
+ target.sendPacket(new AskJoinAlly(player.getObjectId(), player.getName(), clan.getAllyName()));
}
}
Index: java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
===================================================================
--- java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java (working copy)
@@ -25,13 +25,13 @@
public class RequestJoinPledge extends GameClientPacket
{
private int _target;
- private int _pledgeType;
+ // private int _pledgeType;
@Override
protected void readImpl()
{
_target = readD();
- _pledgeType = readD();
+ // _pledgeType = readD();
}
@Override
@@ -51,7 +51,7 @@
final PlayerInstance target = (PlayerInstance) World.getInstance().findObject(_target);
final Clan clan = player.getClan();
- if (!clan.checkClanJoinCondition(player, target, _pledgeType))
+ if (!clan.checkClanJoinCondition(player, target, 0))
{
return;
}
@@ -66,6 +66,6 @@
public int getPledgeType()
{
- return _pledgeType;
+ return 0;
}
}
\ No newline at end of file
Index: java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
===================================================================
--- java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java (working copy)
@@ -16,17 +16,12 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import java.util.logging.Logger;
-
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.serverpackets.ManagePledgePower;
public class RequestPledgePower extends GameClientPacket
{
- static Logger LOGGER = Logger.getLogger(RequestPledgePower.class.getName());
-
- private int _rank;
+ private int _clanMemberId;
private int _action;
private int _privs;
@@ -33,9 +28,10 @@
@Override
protected void readImpl()
{
- _rank = readD();
+ _clanMemberId = readD();
_action = readD();
- if (_action == 2)
+
+ if (_action == 3)
{
_privs = readD();
}
@@ -54,27 +50,43 @@
return;
}
- if (_action == 2)
+ if (player.getClan() != null)
{
- if ((player.getClan() != null) && player.isClanLeader())
+ PlayerInstance member = null;
+ if (player.getClan().getClanMember(_clanMemberId) != null)
{
- if (_rank == 9)
+ member = player.getClan().getClanMember(_clanMemberId).getPlayerInstance();
+ }
+
+ switch (_action)
+ {
+ case 1:
{
- // The rights below cannot be bestowed upon Academy members:
- // Join a clan or be dismissed
- // Title management, crest management, master management, level management,
- // bulletin board administration
- // Clan war, right to dismiss, set functions
- // Auction, manage taxes, attack/defend registration, mercenary management
- // => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR?
- _privs = (_privs & Clan.CP_CL_VIEW_WAREHOUSE) + (_privs & Clan.CP_CH_OPEN_DOOR) + (_privs & Clan.CP_CS_OPEN_DOOR);
+ player.sendPacket(new ManagePledgePower(player.getClanPrivileges()));
+ break;
}
- player.getClan().setRankPrivs(_rank, _privs);
+
+ case 2:
+ {
+
+ if (member != null)
+ {
+ player.sendPacket(new ManagePledgePower(member.getClanPrivileges()));
+ }
+ break;
+ }
+ case 3:
+ {
+ if (player.isClanLeader())
+ {
+ if (member != null)
+ {
+ member.setClanPrivileges(_privs);
+ }
+ }
+ break;
+ }
}
}
- else
- {
- player.sendPacket(new ManagePledgePower(getClient().getPlayer().getClan(), _action, _rank));
- }
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java (working copy)
@@ -26,17 +26,15 @@
*/
public class AskJoinAlly extends GameServerPacket
{
+ private final int _requestorId;
private final String _requestorName;
- private final int _requestorObjId;
+ private final String _requestorAllyName;
- /**
- * @param requestorObjId
- * @param requestorName
- */
- public AskJoinAlly(int requestorObjId, String requestorName)
+ public AskJoinAlly(int requestorId, String requestorName, String requestorAllyName)
{
+ _requestorId = requestorId;
_requestorName = requestorName;
- _requestorObjId = requestorObjId;
+ _requestorAllyName = requestorAllyName;
}
@Override
@@ -43,7 +41,9 @@
protected final void writeImpl()
{
writeC(0xa8);
- writeD(_requestorObjId);
+ writeD(_requestorId);
writeS(_requestorName);
+ writeS("");
+ writeS(_requestorAllyName);
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java (working copy)
@@ -43,7 +43,7 @@
writeH(0x30);
writeS(_channel.getChannelLeader().getName());
- writeD(0); // Channel loot
+ // writeD(0); // Channel loot
writeD(_channel.getMemberCount());
writeD(_channel.getParties().size());
@@ -50,7 +50,7 @@
for (Party p : _channel.getParties())
{
writeS(p.getLeader().getName());
- writeD(p.getPartyLeaderOID());
+ // writeD(p.getPartyLeaderOID());
writeD(p.getMemberCount());
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java (working copy)
@@ -156,20 +156,20 @@
writeH(_player.getRecomLeft());
writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
writeD(_player.getClassId().getId());
- writeD(0x00); // special effects? circles around player...
+ // writeD(0x00); // special effects? circles around player...
writeD(_player.getMaxCp());
writeD((int) _player.getCurrentCp());
- writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window
+ // writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window
- writeC(321);
+ // writeC(321);
- writeD(_player.getPledgeClass()); // changes the text above CP on Status Window
+ // writeD(_player.getPledgeClass()); // changes the text above CP on Status Window
- writeC(_player.isNoble() ? 0x01 : 0x00);
- writeC(_player.isHero() ? 0x01 : 0x00);
+ // writeC(_player.isNoble() ? 0x01 : 0x00);
+ // writeC(_player.isHero() ? 0x01 : 0x00);
- writeD(_player.getAppearance().getNameColor());
- writeD(_player.getAppearance().getTitleColor());
+ // writeD(_player.getAppearance().getNameColor());
+ // writeD(_player.getAppearance().getTitleColor());
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java (working copy)
@@ -46,7 +46,7 @@
writeD(skill.isPassive() ? 1 : 0);
writeD(skill.getLevel());
writeD(skill.getId());
- writeC(0x00); // c5
+ // writeC(0x00); // c5
}
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java (working copy)
@@ -16,37 +16,21 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.gameserver.model.clan.Clan;
-
public class ManagePledgePower extends GameServerPacket
{
- private final int _action;
- private final Clan _clan;
- private final int _rank;
+ private final int _privs;
- public ManagePledgePower(Clan clan, int action, int rank)
+ public ManagePledgePower(int privs)
{
- _clan = clan;
- _action = action;
- _rank = rank;
+ _privs = privs;
}
@Override
protected final void writeImpl()
{
- int privs = 0;
- if (_action == 1)
- {
- privs = _clan.getRankPrivs(_rank);
- }
- else
- {
- return;
- }
-
writeC(0x30);
writeD(0);
writeD(0);
- writeD(privs);
+ writeD(_privs);
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java (working copy)
@@ -36,7 +36,10 @@
private final int _x;
private final int _y;
private final int _z;
-
+ private final int _tx;
+ private final int _ty;
+ private final int _tz;
+
public MoveToPawn(Creature creature, Creature target, int distance)
{
_objectId = creature.getObjectId();
@@ -45,6 +48,9 @@
_x = creature.getX();
_y = creature.getY();
_z = creature.getZ();
+ _tx = target.getX();
+ _ty = target.getY();
+ _tz = target.getZ();
}
@Override
@@ -59,5 +65,8 @@
writeD(_x);
writeD(_y);
writeD(_z);
+ writeD(_tx);
+ writeD(_ty);
+ writeD(_tz);
}
}
Index: java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
===================================================================
--- java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java (revision 7753)
+++ java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java (working copy)
@@ -24,6 +24,10 @@
private final int _pitch;
private final int _time;
private final int _duration;
+ private final int _turn;
+ private final int _rise;
+ private final int _widescreen;
+ private final int _unknown;
public SpecialCamera(int id, int dist, int yaw, int pitch, int time, int duration)
{
@@ -33,8 +37,26 @@
_pitch = pitch;
_time = time;
_duration = duration;
+ _turn = 0;
+ _rise = 0;
+ _widescreen = 0;
+ _unknown = 0;
}
+ public SpecialCamera(int id, int dist, int yaw, int pitch, int time, int duration, int turn, int rise, int widescreen, int unk)
+ {
+ _id = id;
+ _dist = dist;
+ _yaw = yaw;
+ _pitch = pitch;
+ _time = time;
+ _duration = duration;
+ _turn = turn;
+ _rise = rise;
+ _widescreen = widescreen;
+ _unknown = unk;
+ }
+
@Override
public void writeImpl()
{
@@ -45,5 +67,9 @@
writeD(_pitch);
writeD(_time);
writeD(_duration);
+ writeD(_turn);
+ writeD(_rise);
+ writeD(_widescreen);
+ writeD(_unknown);
}
}
