瀏覽代碼

Fix champion npc stat multiplier

Maneco2 2 年之前
父節點
當前提交
2dce374355

+ 2 - 2
src/main/java/com/l2jserver/gameserver/model/L2Spawn.java

@@ -563,8 +563,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable {
 		mob.setIsDead(false);
 		// Reset decay info
 		mob.setDecayed(false);
-		// Set the HP and MP of the L2NpcInstance to the max
-		mob.setCurrentHpMp(mob.getMaxHp(), mob.getMaxMp());
 		// Clear script variables
 		if (mob.hasVariables()) {
 			mob.getVariables().getSet().clear();
@@ -596,6 +594,8 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable {
 			}
 		}
 		
+		// Set the HP and MP of the L2NpcInstance to the max
+		mob.setCurrentHpMp(mob.getMaxHp(), mob.getMaxMp());
 		// Reset summoner
 		mob.setSummoner(null);
 		// Reset summoned list

+ 1 - 1
src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5137,7 +5137,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	}
 	
 	public int getMaxHp() {
-		return getStat().getMaxHp();
+		return (customs().championEnable() && isChampion()) ? getStat().getMaxHp() * customs().getChampionHp() : getStat().getMaxHp();
 	}
 	
 	public int getMaxRecoverableHp() {