This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: java/com/l2jserver/gameserver/model/CharEffectList.java | |
=================================================================== | |
--- java/com/l2jserver/gameserver/model/CharEffectList.java (révision 545) | |
+++ java/com/l2jserver/gameserver/model/CharEffectList.java (copie de travail) | |
@@ -799,6 +799,18 @@ | |
} | |
} | |
+ if (hasDebuffs()) | |
+ { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: server/java/com/l2jserver/gameserver/model/actor/L2Summon.java | |
=================================================================== | |
--- server/java/com/l2jserver/gameserver/model/actor/L2Summon.java (révision 521) | |
+++ server/java/com/l2jserver/gameserver/model/actor/L2Summon.java (copie de travail) | |
@@ -583,7 +583,7 @@ | |
@Override | |
public boolean isInvul() | |
{ | |
- return super.isInvul() || getOwner().isSpawnProtected(); | |
+ return super.isInvul() || ((_owner != null) && _owner.isSpawnProtected()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dp/dist/game/data/stats/skills/00800-00899.xml | |
=================================================================== | |
--- dp/dist/game/data/stats/skills/00800-00899.xml (révision 521) | |
+++ dp/dist/game/data/stats/skills/00800-00899.xml (copie de travail) | |
@@ -452,7 +452,7 @@ | |
<set name="reuseDelay" val="2000" /> | |
<set name="targetType" val="SERVITOR" /> | |
<cond msgId="144"> | |
- <target npcRace="CONSTRUCT" /> | |
+ <target summonRace="CONSTRUCT" /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: java/com/l2jserver/gameserver/model/actor/L2Character.java | |
=================================================================== | |
--- java/com/l2jserver/gameserver/model/actor/L2Character.java (révision 6502) | |
+++ java/com/l2jserver/gameserver/model/actor/L2Character.java (copie de travail) | |
@@ -3993,7 +3993,7 @@ | |
*/ | |
public boolean isInCombat() | |
{ | |
- return hasAI() && ((getAI().getAttackTarget() != null) || getAI().isAutoAttacking()); | |
+ return hasAI() && ((getAI().getCastTarget() != null) || (getAI().getAttackTarget() != null) || getAI().isAutoAttacking()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | |
=================================================================== | |
--- dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java (révision 10247) | |
+++ dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java (copie de travail) | |
@@ -104,9 +104,11 @@ | |
} | |
final boolean isCapsuleItem = item.getItem().getDefaultAction() == L2ActionType.capsule; | |
- if (isCapsuleItem || ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0) && (item.isPotion() || item.isElixir() || itemSkill.isSimultaneousCast()))) | |
+ final boolean isSkillReduceItem = item.getItem().getDefaultAction() == L2ActionType.skill_reduce; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: java/com/l2jserver/gameserver/model/actor/L2Summon.java | |
=================================================================== | |
--- java/com/l2jserver/gameserver/model/actor/L2Summon.java (révision 6436) | |
+++ java/com/l2jserver/gameserver/model/actor/L2Summon.java (copie de travail) | |
@@ -463,6 +463,7 @@ | |
storeMe(); | |
storeEffect(true); | |
+ stopAllEffects(); | |
owner.setPet(null); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dist/game/data/scripts/quests/Q00382_KailsMagicCoin/30687-01.htm | |
=================================================================== | |
--- dist/game/data/scripts/quests/Q00382_KailsMagicCoin/30687-01.htm (révision 0) | |
+++ dist/game/data/scripts/quests/Q00382_KailsMagicCoin/30687-01.htm (copie de travail) | |
@@ -0,0 +1,4 @@ | |
+<html><body>Head Blacksmith Vergara:<br> | |
+I can't remember the last time I saw royalty! Sigh...<br> | |
+(This quest may only be undertaken by a royal character of level 55 or above.) | |
+</body></html> | |
\ Pas de retour chariot à la fin du fichier |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: java/com/l2jserver/gameserver/model/actor/L2Character.java | |
=================================================================== | |
--- java/com/l2jserver/gameserver/model/actor/L2Character.java (révision 6374) | |
+++ java/com/l2jserver/gameserver/model/actor/L2Character.java (copie de travail) | |
@@ -1416,9 +1416,10 @@ | |
int attackcount = 0; | |
// if (angleChar <= 0) angleChar += 360; | |
+ double attackpercent = 100; | |
+ boolean hitted = doAttackHitSimple(attack, target, attackpercent, sAtk); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | |
=================================================================== | |
--- dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java (révision 10163) | |
+++ dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java (copie de travail) | |
@@ -25,6 +25,7 @@ | |
import com.l2jserver.gameserver.model.entity.TvTEvent; | |
import com.l2jserver.gameserver.model.holders.SkillHolder; | |
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; | |
+import com.l2jserver.gameserver.model.items.type.L2ActionType; | |
import com.l2jserver.gameserver.model.skills.L2Skill; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java | |
=================================================================== | |
--- java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java (révision 6409) | |
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java (copie de travail) | |
@@ -115,7 +115,7 @@ | |
// Hack check. Doesn't apply to all Skill Types | |
final int prevSkillLevel = activeChar.getSkillLevel(_id); | |
- if ((prevSkillLevel > 0) && !((_skillType == AcquireSkillType.TRANSFER) || (_skillType == AcquireSkillType.SUBPLEDGE))) | |
+ if ((prevSkillLevel > 0) && !((_skillType == AcquireSkillType.TRANSFER) || (_skillType == AcquireSkillType.SUBPLEDGE) || (_skillType == AcquireSkillType.SUBCLASS))) |
NewerOlder