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

Sync with L2jServer HighFive Dec 21st 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-12-21 11:05:04 +00:00
parent 130fa65bbd
commit 4bfbad7c46
74 changed files with 2194 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java vendored
View File

@@ -55,7 +55,7 @@ public final class DispelBySlotProbability extends AbstractEffect
for (String ngtStack : _dispel.split(";"))
{
String[] ngt = ngtStack.split(",");
_dispelAbnormals.put(AbnormalType.getAbnormalType(ngt[0]), Short.MAX_VALUE);
_dispelAbnormals.put(AbnormalType.getAbnormalType(ngt[0]), (ngt.length > 1) ? Short.parseShort(ngt[1]) : Short.MAX_VALUE);
}
}
else

9
trunk/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java vendored
View File

@@ -57,6 +57,7 @@ public final class ServitorShare extends AbstractEffect
for (L2Summon summon : info.getEffected().getActingPlayer().getServitors().values())
{
summon.broadcastInfo();
summon.getStatus().startHpMpRegeneration();
}
}
}
@@ -81,6 +82,14 @@ public final class ServitorShare extends AbstractEffect
{
for (L2Summon summon : info.getEffected().getActingPlayer().getServitors().values())
{
if (summon.getCurrentHp() > summon.getMaxHp())
{
summon.setCurrentHp(summon.getMaxHp());
}
if (summon.getCurrentMp() > summon.getMaxMp())
{
summon.setCurrentMp(summon.getMaxMp());
}
summon.broadcastInfo();
}
}