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

Sync with L2JServer Jan 26th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-27 01:59:37 +00:00
parent 5d7ab65416
commit bfe682bbe3
63 changed files with 1049 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java vendored
View File

@ -22,7 +22,6 @@ import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
/**
* Newbie Weapon/Accesories Coupons for the Hellbound opening event.<br>
@ -79,7 +78,6 @@ public final class NewbieCoupons extends Quest
return htmltext;
}
QuestState st = getQuestState(player, false);
int newbie = player.getNewbie();
int level = player.getLevel();
int occupation_level = player.getClassId().level();
@ -95,7 +93,7 @@ public final class NewbieCoupons extends Quest
if ((newbie | NEWBIE_WEAPON) != newbie)
{
player.setNewbie(newbie | NEWBIE_WEAPON);
st.giveItems(COUPON_ONE, 5);
giveItems(player, COUPON_ONE, 5);
htmltext = "30598-2.htm"; // here's the coupon you requested
}
else
@ -116,7 +114,7 @@ public final class NewbieCoupons extends Quest
if ((newbie | NEWBIE_ACCESORY) != newbie)
{
player.setNewbie(newbie | NEWBIE_ACCESORY);
st.giveItems(COUPON_TWO, 1);
giveItems(player, COUPON_TWO, 1);
htmltext = "30598-5.htm"; // here's the coupon you requested
}
else

10
trunk/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java vendored
View File

@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.util.Util;
/**
@ -273,12 +272,6 @@ public final class NpcLocationInfo extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
QuestState st = getQuestState(player, false);
if (st == null)
{
return htmltext;
}
if (Util.isDigit(event))
{
@ -295,10 +288,9 @@ public final class NpcLocationInfo extends Quest
y = spawn.getY();
z = spawn.getZ();
}
st.addRadar(x, y, z);
addRadar(player, x, y, z);
htmltext = "MoveToLoc.htm";
}
st.exitQuest(true);
}
return htmltext;
}