2
0
Эх сурвалжийг харах

BETA: Core-part for ​​​​[DP9706].
Reviewed by: MELERIX, Zoey76

Adry_85 12 жил өмнө
parent
commit
ff5033a9d4

+ 27 - 34
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -6593,47 +6593,40 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 						}
 					}
 					
-					// crafting does not trigger any chance skills
-					// possibly should be unhardcoded
-					switch (skill.getSkillType())
+					// Static skills not trigger any chance skills
+					if (!skill.isStatic())
 					{
-						case COMMON_CRAFT:
-						case DWARVEN_CRAFT:
-							break;
-						default:
+						// Launch weapon Special ability skill effect if available
+						if ((activeWeapon != null) && !target.isDead())
 						{
-							// Launch weapon Special ability skill effect if available
-							if ((activeWeapon != null) && !target.isDead())
-							{
-								if (activeWeapon.getSkillEffects(this, target, skill) && isPlayer())
-								{
-									SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED);
-									sm.addSkillName(skill);
-									sendPacket(sm);
-								}
-							}
-							
-							// Maybe launch chance skills on us
-							if (_chanceSkills != null)
-							{
-								_chanceSkills.onSkillHit(target, skill, false);
-							}
-							// Maybe launch chance skills on target
-							if (target.getChanceSkills() != null)
+							if (activeWeapon.getSkillEffects(this, target, skill) && isPlayer())
 							{
-								target.getChanceSkills().onSkillHit(this, skill, true);
+								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED);
+								sm.addSkillName(skill);
+								sendPacket(sm);
 							}
-							
-							if (_triggerSkills != null)
+						}
+						
+						// Maybe launch chance skills on us
+						if (_chanceSkills != null)
+						{
+							_chanceSkills.onSkillHit(target, skill, false);
+						}
+						// Maybe launch chance skills on target
+						if (target.getChanceSkills() != null)
+						{
+							target.getChanceSkills().onSkillHit(this, skill, true);
+						}
+						
+						if (_triggerSkills != null)
+						{
+							for (OptionsSkillHolder holder : _triggerSkills.values())
 							{
-								for (OptionsSkillHolder holder : _triggerSkills.values())
+								if ((skill.isMagic() && (holder.getSkillType() == OptionsSkillType.MAGIC)) || (skill.isPhysical() && (holder.getSkillType() == OptionsSkillType.ATTACK)))
 								{
-									if ((skill.isMagic() && (holder.getSkillType() == OptionsSkillType.MAGIC)) || (skill.isPhysical() && (holder.getSkillType() == OptionsSkillType.ATTACK)))
+									if (Rnd.get(100) < holder.getChance())
 									{
-										if (Rnd.get(100) < holder.getChance())
-										{
-											makeTriggerCast(holder.getSkill(), target);
-										}
+										makeTriggerCast(holder.getSkill(), target);
 									}
 								}
 							}

+ 0 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2SkillType.java

@@ -68,9 +68,6 @@ public enum L2SkillType
 	INSTANT_JUMP,
 	DETECTION,
 	DUMMY,
-	// Creation
-	COMMON_CRAFT,
-	DWARVEN_CRAFT,
 	// Summons
 	SUMMON(L2SkillSummon.class),
 	FEED_PET,