Pārlūkot izejas kodu

COMMUNITY/BETA: C3P0 Lib Update, also removed some unused skill parameters.

MELERIX 12 gadi atpakaļ
vecāks
revīzija
eaa1fed6ae

+ 3 - 3
L2J_Server_BETA/.classpath

@@ -2,18 +2,18 @@
 <classpath>
 	<classpathentry kind="src" path="java" />
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="lib" path="dist/libs/c3p0-0.9.2-pre4.jar" />
+	<classpathentry kind="lib" path="dist/libs/c3p0-0.9.2-pre5.jar" />
 	<classpathentry kind="lib" path="dist/libs/javolution-5.5.1.jar" sourcepath="dist/libs/javolution-5.5.1-src.zip" />
 	<classpathentry kind="lib" path="dist/libs/jna.jar" />
 	<classpathentry kind="lib" path="dist/libs/jython.jar" />
 	<classpathentry kind="lib" path="dist/libs/jython-engine-2.2.1.jar" />
 	<classpathentry kind="lib" path="dist/libs/mail.jar" />
 	<classpathentry kind="lib" path="dist/libs/mailapi.jar" />
-	<classpathentry kind="lib" path="dist/libs/mchange-commons-java-0.2.2.jar" />
+	<classpathentry kind="lib" path="dist/libs/mchange-commons-java-0.2.3.jar" />
 	<classpathentry kind="lib" path="dist/libs/mmocore.jar" />
 	<classpathentry kind="lib" path="dist/libs/netcon-1.7.jar" />
 	<classpathentry kind="lib" path="dist/libs/smtp.jar" />
 	<classpathentry kind="lib" path="dist/libs/trove-3.0.3.jar" />
 	<classpathentry kind="lib" path="dist/libs/Subnet.jar" />
 	<classpathentry kind="output" path="bin" />
-</classpath>
+</classpath>

BIN
L2J_Server_BETA/dist/libs/c3p0-0.9.2-pre4.jar → L2J_Server_BETA/dist/libs/c3p0-0.9.2-pre5.jar


BIN
L2J_Server_BETA/dist/libs/mchange-commons-java-0.2.2.jar → L2J_Server_BETA/dist/libs/mchange-commons-java-0.2.3.jar


+ 0 - 22
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -156,8 +156,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	private final int _magicLevel;
 	private final int _levelDepend;
 	private final boolean _ignoreResists;
-	private final int _minChance;
-	private final int _maxChance;
 	private final int _blowChance;
 	
 	private final boolean _isNeutral;
@@ -413,8 +411,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		_magicLevel = set.getInteger("magicLvl", 0);
 		_levelDepend = set.getInteger("lvlDepend", 0);
 		_ignoreResists = set.getBool("ignoreResists", false);
-		_minChance = set.getInteger("minChance", Config.MIN_DEBUFF_CHANCE);
-		_maxChance = set.getInteger("maxChance", Config.MAX_DEBUFF_CHANCE);
 		_stat = set.getEnum("stat", Stats.class, null);
 		_ignoreShield = set.getBool("ignoreShld", false);
 		_skillType = set.getEnum("skillType", L2SkillType.class, L2SkillType.DUMMY);
@@ -685,24 +681,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		return _ignoreResists;
 	}
 	
-	/**
-	 * Return minimum skill/effect land rate (default is 1).
-	 * @return
-	 */
-	public final int getMinChance()
-	{
-		return _minChance;
-	}
-	
-	/**
-	 * Return maximum skill/effect land rate (default is 99).
-	 * @return
-	 */
-	public final int getMaxChance()
-	{
-		return _maxChance;
-	}
-	
 	/**
 	 * Return true if skill effects should be removed on any action except movement
 	 * @return

+ 16 - 16
L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -2050,13 +2050,13 @@ public final class Formulas
 		int deltamod = calcLvlDependModifier(attacker, target, skill);
 		rate += deltamod;
 		
-		if (rate > skill.getMaxChance())
+		if (rate > Config.MAX_DEBUFF_CHANCE)
 		{
-			rate = skill.getMaxChance();
+			rate = Config.MAX_DEBUFF_CHANCE;
 		}
-		else if (rate < skill.getMinChance())
+		else if (rate < Config.MIN_DEBUFF_CHANCE)
 		{
-			rate = skill.getMinChance();
+			rate = Config.MIN_DEBUFF_CHANCE;
 		}
 		
 		if (attacker.isDebug() || Config.DEVELOPER)
@@ -2172,13 +2172,13 @@ public final class Formulas
 		int deltamod = calcLvlDependModifier(attacker, target, skill);
 		rate += deltamod;
 		
-		if (rate > skill.getMaxChance())
+		if (rate > Config.MAX_DEBUFF_CHANCE)
 		{
-			rate = skill.getMaxChance();
+			rate = Config.MAX_DEBUFF_CHANCE;
 		}
-		else if (rate < skill.getMinChance())
+		else if (rate < Config.MIN_DEBUFF_CHANCE)
 		{
-			rate = skill.getMinChance();
+			rate = Config.MIN_DEBUFF_CHANCE;
 		}
 		
 		if (attacker.isDebug() || Config.DEVELOPER)
@@ -2269,13 +2269,13 @@ public final class Formulas
 		int deltamod = calcLvlDependModifier(attacker.getOwner(), target, skill);
 		rate += deltamod;
 		
-		if (rate > skill.getMaxChance())
+		if (rate > Config.MAX_DEBUFF_CHANCE)
 		{
-			rate = skill.getMaxChance();
+			rate = Config.MAX_DEBUFF_CHANCE;
 		}
-		else if (rate < skill.getMinChance())
+		else if (rate < Config.MIN_DEBUFF_CHANCE)
 		{
-			rate = skill.getMinChance();
+			rate = Config.MIN_DEBUFF_CHANCE;
 		}
 		
 		if (attacker.getOwner().isDebug() || Config.DEVELOPER)
@@ -2324,13 +2324,13 @@ public final class Formulas
 		final double failureModifier = attacker.calcStat(Stats.MAGIC_FAILURE_RATE, 1, target, skill);
 		int rate = 100 - Math.round((float) (lvlModifier * targetModifier * resModifier * failureModifier));
 		
-		if (rate > skill.getMaxChance())
+		if (rate > Config.MAX_DEBUFF_CHANCE)
 		{
-			rate = skill.getMaxChance();
+			rate = Config.MAX_DEBUFF_CHANCE;
 		}
-		else if (rate < skill.getMinChance())
+		else if (rate < Config.MIN_DEBUFF_CHANCE)
 		{
-			rate = skill.getMinChance();
+			rate = Config.MIN_DEBUFF_CHANCE;
 		}
 		
 		if (attacker.isDebug() || Config.DEVELOPER)