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

4
L2J_Mobius_7.0_PreludeOfWar/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());
@@ -148,7 +148,7 @@ public class CallPc extends AbstractEffect
}
final Instance instance = effector.getInstanceWorld();
if ((instance != null) && !instance.isPlayerSummonAllowed())
if (((instance != null) && !instance.isPlayerSummonAllowed()) || effector.isInTimedHuntingZone())
{
effector.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION);
return false;

2
L2J_Mobius_7.0_PreludeOfWar/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);
}
}
}