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

Proper summon request holder.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-04-27 22:31:17 +00:00
parent e7377ff021
commit 2e5fe7f64c
68 changed files with 288 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
sm.addItemName(_itemId);
target.sendPacket(sm);
}
target.addScript(new SummonRequestHolder(player));
target.addScript(new SummonRequestHolder(player, skill));
final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
confirm.getSystemMessage().addString(player.getName());
confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java vendored
View File

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
return;
}
effector.teleToLocation(effector.getTarget(), true, null);
effector.teleToLocation(target, true, null);
}
}
}

22
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java
View File

@@ -16,30 +16,30 @@
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
/**
* @author UnAfraid
* @author Mobius
*/
public class SummonRequestHolder
{
private final PlayerInstance _target;
private final Skill _skill;
private final PlayerInstance _summoner;
private final Location _location;
public SummonRequestHolder(PlayerInstance destination, Skill skill)
public SummonRequestHolder(PlayerInstance summoner)
{
_target = destination;
_skill = skill;
_summoner = summoner;
_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
}
public PlayerInstance getTarget()
public PlayerInstance getSummoner()
{
return _target;
return _summoner;
}
public Skill getSkill()
public Location getLocation()
{
return _skill;
return _location;
}
}

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
View File

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
{
final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
{
player.teleToLocation(holder.getTarget().getLocation(), true);
player.teleToLocation(holder.getLocation(), true);
}
}
else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())