Minor DlgAnswer related cleanup.
This commit is contained in:
@@ -530,7 +530,7 @@ public class PlayerInstance extends Playable
|
|||||||
private long _punishTimer = 0;
|
private long _punishTimer = 0;
|
||||||
private ScheduledFuture<?> _punishTask;
|
private ScheduledFuture<?> _punishTask;
|
||||||
private final GatesRequest _gatesRequest = new GatesRequest();
|
private final GatesRequest _gatesRequest = new GatesRequest();
|
||||||
private final HashMap<Integer, Long> confirmDlgRequests = new HashMap<>();
|
private final HashMap<Integer, Long> _confirmDlgRequests = new HashMap<>();
|
||||||
private int _currentMultiSellId = -1;
|
private int _currentMultiSellId = -1;
|
||||||
private int _partyroom = 0;
|
private int _partyroom = 0;
|
||||||
private Future<?> _autoSaveTask = null;
|
private Future<?> _autoSaveTask = null;
|
||||||
@@ -5799,7 +5799,7 @@ public class PlayerInstance extends Playable
|
|||||||
* Engage answer.
|
* Engage answer.
|
||||||
* @param answer the answer
|
* @param answer the answer
|
||||||
*/
|
*/
|
||||||
public void EngageAnswer(int answer)
|
public void engageAnswer(int answer)
|
||||||
{
|
{
|
||||||
if (!_engagerequest || (_engageid == 0))
|
if (!_engagerequest || (_engageid == 0))
|
||||||
{
|
{
|
||||||
@@ -16419,17 +16419,17 @@ public class PlayerInstance extends Playable
|
|||||||
|
|
||||||
public void addConfirmDlgRequestTime(int requestId, int time)
|
public void addConfirmDlgRequestTime(int requestId, int time)
|
||||||
{
|
{
|
||||||
confirmDlgRequests.put(requestId, System.currentTimeMillis() + time + 2000);
|
_confirmDlgRequests.put(requestId, System.currentTimeMillis() + time + 2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getConfirmDlgRequestTime(int requestId)
|
public Long getConfirmDlgRequestTime(int requestId)
|
||||||
{
|
{
|
||||||
return confirmDlgRequests.get(requestId);
|
return _confirmDlgRequests.get(requestId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removeConfirmDlgRequestTime(int requestId)
|
public void removeConfirmDlgRequestTime(int requestId)
|
||||||
{
|
{
|
||||||
confirmDlgRequests.remove(requestId);
|
_confirmDlgRequests.remove(requestId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -27,14 +27,14 @@ public class DlgAnswer extends GameClientPacket
|
|||||||
{
|
{
|
||||||
private int _messageId;
|
private int _messageId;
|
||||||
private int _answer;
|
private int _answer;
|
||||||
private int _requestId;
|
private int _requesterId;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void readImpl()
|
protected void readImpl()
|
||||||
{
|
{
|
||||||
_messageId = readD();
|
_messageId = readD();
|
||||||
_answer = readD();
|
_answer = readD();
|
||||||
_requestId = readD();
|
_requesterId = readD();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -46,12 +46,12 @@ public class DlgAnswer extends GameClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Long answerTime = getClient().getPlayer().getConfirmDlgRequestTime(_requestId);
|
final Long answerTime = player.getConfirmDlgRequestTime(_requesterId);
|
||||||
if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime))
|
if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime))
|
||||||
{
|
{
|
||||||
_answer = 0;
|
_answer = 0;
|
||||||
}
|
}
|
||||||
getClient().getPlayer().removeConfirmDlgRequestTime(_requestId);
|
player.removeConfirmDlgRequestTime(_requesterId);
|
||||||
|
|
||||||
if (_messageId == SystemMessageId.S1_IS_MAKING_AN_ATTEMPT_AT_RESURRECTION_DO_YOU_WANT_TO_CONTINUE_WITH_THIS_RESURRECTION.getId())
|
if (_messageId == SystemMessageId.S1_IS_MAKING_AN_ATTEMPT_AT_RESURRECTION_DO_YOU_WANT_TO_CONTINUE_WITH_THIS_RESURRECTION.getId())
|
||||||
{
|
{
|
||||||
@@ -59,7 +59,7 @@ public class DlgAnswer extends GameClientPacket
|
|||||||
}
|
}
|
||||||
else if (_messageId == SystemMessageId.S1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
|
else if (_messageId == SystemMessageId.S1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
|
||||||
{
|
{
|
||||||
player.teleportAnswer(_answer, _requestId);
|
player.teleportAnswer(_answer, _requesterId);
|
||||||
}
|
}
|
||||||
else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())
|
else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())
|
||||||
{
|
{
|
||||||
@@ -69,9 +69,9 @@ public class DlgAnswer extends GameClientPacket
|
|||||||
{
|
{
|
||||||
player.gatesAnswer(_answer, 0);
|
player.gatesAnswer(_answer, 0);
|
||||||
}
|
}
|
||||||
else if ((_messageId == 614) && Config.ALLOW_WEDDING)
|
else if ((_messageId == SystemMessageId.S1_S2.getId()) && Config.ALLOW_WEDDING)
|
||||||
{
|
{
|
||||||
player.EngageAnswer(_answer);
|
player.engageAnswer(_answer);
|
||||||
}
|
}
|
||||||
else if (_messageId == SystemMessageId.S1.getId())
|
else if (_messageId == SystemMessageId.S1.getId())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user