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

Sync with L2jServer HighFive Oct 10th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-10-10 13:28:13 +00:00
parent 2a827d8120
commit 2dd6094e0f
39 changed files with 601 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@ -18,9 +18,7 @@
*/
package handlers.admincommandhandlers;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@ -123,16 +121,18 @@ public class AdminEventEngine implements IAdminCommandHandler
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "events/" + eventName)));
BufferedReader inbr = new BufferedReader(new InputStreamReader(in));
adminReply.setFile("en", "html/mods/EventEngine/Participation.htm");
adminReply.replace("%eventName%", eventName);
adminReply.replace("%eventCreator%", inbr.readLine());
adminReply.replace("%eventInfo%", inbr.readLine());
adminReply.replace("npc_%objectId%_event_participate", "admin_event"); // Weird, but nice hack, isnt it? :)
adminReply.replace("button value=\"Participate\"", "button value=\"Back\"");
activeChar.sendPacket(adminReply);
inbr.close();
try (FileInputStream fis = new FileInputStream(Config.DATAPACK_ROOT + "events/" + eventName);
InputStreamReader isr = new InputStreamReader(fis);
BufferedReader br = new BufferedReader(isr))
{
adminReply.setFile("en", "html/mods/EventEngine/Participation.htm");
adminReply.replace("%eventName%", eventName);
adminReply.replace("%eventCreator%", br.readLine());
adminReply.replace("%eventInfo%", br.readLine());
adminReply.replace("npc_%objectId%_event_participate", "admin_event"); // Weird, but nice hack, isnt it? :)
adminReply.replace("button value=\"Participate\"", "button value=\"Back\"");
activeChar.sendPacket(adminReply);
}
}
catch (Exception e)
{
@ -165,12 +165,12 @@ public class AdminEventEngine implements IAdminCommandHandler
{
try
{
FileOutputStream file = new FileOutputStream(new File(Config.DATAPACK_ROOT, "events/" + tempName));
PrintStream p = new PrintStream(file);
p.println(activeChar.getName());
p.println(tempBuffer);
file.close();
p.close();
try (FileOutputStream file = new FileOutputStream(new File(Config.DATAPACK_ROOT, "events/" + tempName));
PrintStream p = new PrintStream(file))
{
p.println(activeChar.getName());
p.println(tempBuffer);
}
}
catch (Exception e)
{
@ -476,7 +476,7 @@ public class AdminEventEngine implements IAdminCommandHandler
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final String replyMSG = StringUtil.concat("<html><title>[ L2J EVENT ENGINE ]</title><body>" + "<br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=150 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">" + "<center><br><font color=LEVEL>Stored Events:</font><br></center>", showStoredEvents(), "</body></html>");
final String replyMSG = StringUtil.concat("<html><title>[ EVENT ENGINE ]</title><body>" + "<br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=150 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">" + "<center><br><font color=LEVEL>Stored Events:</font><br></center>", showStoredEvents(), "</body></html>");
adminReply.setHtml(replyMSG);
activeChar.sendPacket(adminReply);
}

24
trunk/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java vendored
View File

@ -18,8 +18,8 @@
*/
package handlers.effecthandlers;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@ -64,29 +64,15 @@ public final class RandomizeHate extends AbstractEffect
return;
}
L2Attackable effectedMob = (L2Attackable) info.getEffected();
final List<L2Character> targetList = new ArrayList<>();
for (L2Character cha : info.getEffected().getKnownList().getKnownCharacters())
{
if ((cha != null) && (cha != effectedMob) && (cha != info.getEffector()))
{
// Aggro cannot be transfered to a mob of the same faction.
if (cha.isAttackable() && ((L2Attackable) cha).isInMyClan(effectedMob))
{
continue;
}
targetList.add(cha);
}
}
// if there is no target, exit function
if (targetList.isEmpty())
final L2Attackable effectedMob = (L2Attackable) info.getEffected();
final List<L2Character> aggroList = effectedMob.getAggroList().keySet().stream().filter(c -> c != info.getEffector()).collect(Collectors.toList());
if (aggroList.isEmpty())
{
return;
}
// Choosing randomly a new target
final L2Character target = targetList.get(Rnd.get(targetList.size()));
final L2Character target = aggroList.get(Rnd.get(aggroList.size()));
final int hate = effectedMob.getHating(info.getEffector());
effectedMob.stopHating(info.getEffector());
effectedMob.addDamageHate(target, 0, hate);