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

12
trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@ -130,7 +130,17 @@ public class QuestLink implements IBypassHandler
}
else
{
StringUtil.append(sb, "<fstring>", String.valueOf(quest.getId()), state, "</fstring>");
int questId = quest.getId();
if (quest.getId() > 10000)
{
questId -= 5000;
}
else if (questId == 146)
{
questId = 640;
}
StringUtil.append(sb, "<fstring>", String.valueOf(questId), state, "</fstring>");
}
sb.append("</button></font><br>");
}

26
trunk/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java vendored
View File

@ -18,6 +18,8 @@
*/
package handlers.effecthandlers;
import java.util.Collection;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -63,21 +65,19 @@ public final class Sweeper extends AbstractEffect
return;
}
final ItemHolder[] items = monster.takeSweep();
if ((items == null) || (items.length == 0))
final Collection<ItemHolder> items = monster.takeSweep();
if (items != null)
{
return;
}
for (ItemHolder item : items)
{
if (player.isInParty())
for (ItemHolder item : items)
{
player.getParty().distributeItem(player, item, true, monster);
}
else
{
player.addItem("Sweeper", item, info.getEffected(), true);
if (player.isInParty())
{
player.getParty().distributeItem(player, item, true, monster);
}
else
{
player.addItem("Sweeper", item, info.getEffected(), true);
}
}
}
}