Browse Source

BETA: Typo fixing.

Zoey76 13 years ago
parent
commit
7a8159ff2c

+ 8 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -1686,11 +1686,10 @@ public class SevenSignsFestival implements SpawnListener
 	}
 	}
 	
 	
 	/**
 	/**
-	 * Used to send a "shout" message to all players currently present in an Oracle.
+	 * Used to send a "shout" message to all players currently present in an Oracle.<br>
 	 * Primarily used for Festival Guide and Witch related speech.
 	 * Primarily used for Festival Guide and Witch related speech.
-	 *
 	 * @param senderName
 	 * @param senderName
-	 * @param message
+	 * @param npcString
 	 */
 	 */
 	public void sendMessageToAll(String senderName, NpcStringId npcString)
 	public void sendMessageToAll(String senderName, NpcStringId npcString)
 	{
 	{
@@ -1701,6 +1700,11 @@ public class SevenSignsFestival implements SpawnListener
 		sendMessageToAll(senderName, npcString, _duskChatGuide);
 		sendMessageToAll(senderName, npcString, _duskChatGuide);
 	}
 	}
 	
 	
+	/**
+	 * @param senderName
+	 * @param npcString
+	 * @param npc
+	 */
 	public void sendMessageToAll(String senderName, NpcStringId npcString, L2Npc npc)
 	public void sendMessageToAll(String senderName, NpcStringId npcString, L2Npc npc)
 	{
 	{
 		CreatureSay cs = new CreatureSay(npc.getObjectId(), Say2.SHOUT, senderName, npcString);
 		CreatureSay cs = new CreatureSay(npc.getObjectId(), Say2.SHOUT, senderName, npcString);
@@ -1889,7 +1893,7 @@ public class SevenSignsFestival implements SpawnListener
 				for (L2DarknessFestival festivalInst : _festivalInstances.values())
 				for (L2DarknessFestival festivalInst : _festivalInstances.values())
 				{
 				{
 					festivalInst.festivalStart();
 					festivalInst.festivalStart();
-					festivalInst.sendMessageToParticipants(NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING	);
+					festivalInst.sendMessageToParticipants(NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING);
 				}
 				}
 				
 				
 				if (Config.DEBUG)
 				if (Config.DEBUG)

+ 5 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -56,8 +56,7 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.Rnd;
 
 
 /**
 /**
- * This class manages AI of L2Attackable.<BR><BR>
- *
+ * This class manages AI of L2Attackable.
  */
  */
 public class L2AttackableAI extends L2CharacterAI implements Runnable
 public class L2AttackableAI extends L2CharacterAI implements Runnable
 {
 {
@@ -779,9 +778,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 
 
 		final int combinedCollision = collision + mostHate.getTemplate().collisionRadius;
 		final int combinedCollision = collision + mostHate.getTemplate().collisionRadius;
 
 
-		if (_skillrender.hasSuesideSkill() && (int) ((npc.getCurrentHp() / npc.getMaxHp()) * 100) < 30)
+		if (_skillrender.hasSuicideSkill() && (int) ((npc.getCurrentHp() / npc.getMaxHp()) * 100) < 30)
 		{
 		{
-			L2Skill skill = _skillrender._suesideskills.get(Rnd.nextInt(_skillrender._suesideskills.size()));	
+			final L2Skill skill = _skillrender.getSuicideSkills().get(Rnd.nextInt(_skillrender.getSuicideSkills().size()));	
 			if (Util.checkIfInRange(skill.getSkillRadius(), getActiveChar(), mostHate, false) && Rnd.get(100) < Rnd.get(npc.getMinSkillChance(), npc.getMaxSkillChance()))
 			if (Util.checkIfInRange(skill.getSkillRadius(), getActiveChar(), mostHate, false) && Rnd.get(100) < Rnd.get(npc.getMinSkillChance(), npc.getMaxSkillChance()))
 			{
 			{
 				if (cast(skill))
 				if (cast(skill))
@@ -790,7 +789,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				}
 				else
 				else
 				{
 				{
-					for (L2Skill sk : _skillrender._suesideskills)
+					for (L2Skill sk : _skillrender.getSuicideSkills())
 					{
 					{
 						if (cast(sk))
 						if (cast(sk))
 						{
 						{
@@ -1138,7 +1137,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				}
 			}
 			}
 		}
 		}
-				
+		
 		//--------------------------------------------------------------------------------
 		//--------------------------------------------------------------------------------
 		// Starts Melee or Primary Skill
 		// Starts Melee or Primary Skill
 		if (dist2 > range || !GeoData.getInstance().canSeeTarget(npc, mostHate))
 		if (dist2 > range || !GeoData.getInstance().canSeeTarget(npc, mostHate))

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

@@ -211,9 +211,9 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 				else
 				else
 					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S2_SUCCESSFULLY_ADDED_TO_S1);
 					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S2_SUCCESSFULLY_ADDED_TO_S1);
 				sm.addItemName(item);
 				sm.addItemName(item);
-				sm.addElemntal(realElement);
+				sm.addElemental(realElement);
 				if (item.isArmor())
 				if (item.isArmor())
-					sm.addElemntal(Elementals.getOppositeElement(realElement));
+					sm.addElemental(Elementals.getOppositeElement(realElement));
 			}
 			}
 			else
 			else
 			{
 			{
@@ -223,9 +223,9 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S3_SUCCESSFULLY_ADDED_TO_S1_S2);
 					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S3_SUCCESSFULLY_ADDED_TO_S1_S2);
 				sm.addNumber(item.getEnchantLevel());
 				sm.addNumber(item.getEnchantLevel());
 				sm.addItemName(item);
 				sm.addItemName(item);
-				sm.addElemntal(realElement);
+				sm.addElemental(realElement);
 				if (item.isArmor())
 				if (item.isArmor())
-					sm.addElemntal(Elementals.getOppositeElement(realElement));
+					sm.addElemental(Elementals.getOppositeElement(realElement));
 			}
 			}
 			player.sendPacket(sm);
 			player.sendPacket(sm);
 			item.setElementAttr(elementToAdd, newPower);
 			item.setElementAttr(elementToAdd, newPower);

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

@@ -81,8 +81,8 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
 				sm.addItemName(targetItem);
 				sm.addItemName(targetItem);
 				if (targetItem.isArmor())
 				if (targetItem.isArmor())
 				{
 				{
-					sm.addElemntal(realElement);
-					sm.addElemntal(Elementals.getOppositeElement(realElement));
+					sm.addElemental(realElement);
+					sm.addElemental(Elementals.getOppositeElement(realElement));
 				}
 				}
 			}
 			}
 			else
 			else
@@ -94,8 +94,8 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
 				sm.addItemName(targetItem);
 				sm.addItemName(targetItem);
 				if (targetItem.isArmor())
 				if (targetItem.isArmor())
 				{
 				{
-					sm.addElemntal(realElement);
-					sm.addElemntal(Elementals.getOppositeElement(realElement));
+					sm.addElemental(realElement);
+					sm.addElemental(Elementals.getOppositeElement(realElement));
 				}
 				}
 			}
 			}
 			activeChar.sendPacket(sm);
 			activeChar.sendPacket(sm);

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java

@@ -300,7 +300,7 @@ public final class SystemMessage extends L2GameServerPacket
 	 * @param type
 	 * @param type
 	 * @return
 	 * @return
 	 */
 	 */
-	public final SystemMessage addElemntal(final int type)
+	public final SystemMessage addElemental(final int type)
 	{
 	{
 		append(new SMParam(TYPE_ELEMENT_NAME, type));
 		append(new SMParam(TYPE_ELEMENT_NAME, type));
 		return this;
 		return this;

+ 15 - 11
L2J_Server_BETA/java/com/l2jserver/gameserver/templates/chars/L2NpcTemplate.java

@@ -98,7 +98,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 	public FastList<L2Skill> _Lrangeskills;
 	public FastList<L2Skill> _Lrangeskills;
 	public FastList<L2Skill> _Srangeskills;
 	public FastList<L2Skill> _Srangeskills;
 	public FastList<L2Skill> _generalskills;
 	public FastList<L2Skill> _generalskills;
-	public FastList<L2Skill> _suesideskills;
+	private FastList<L2Skill> _suicideSkills;
 	
 	
 	private boolean _hasbuffskills;
 	private boolean _hasbuffskills;
 	private boolean _hasnegativeskills;
 	private boolean _hasnegativeskills;
@@ -120,7 +120,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 	private boolean _hasLrangeskills;
 	private boolean _hasLrangeskills;
 	private boolean _hasSrangeskills;
 	private boolean _hasSrangeskills;
 	private boolean _hasgeneralskills;
 	private boolean _hasgeneralskills;
-	private boolean _hassuesideskills;
+	private boolean _hasSuicideSkills;
 	
 	
 	private L2NpcAIData _AIdataStatic = new L2NpcAIData();
 	private L2NpcAIData _AIdataStatic = new L2NpcAIData();
 	
 	
@@ -319,7 +319,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 		{
 		{
 			if (skill.isSuicideAttack())
 			if (skill.isSuicideAttack())
 			{
 			{
-				addSuesideSkill(skill);
+				addSuicideSkill(skill);
 			}
 			}
 			else
 			else
 			{
 			{
@@ -831,16 +831,15 @@ public final class L2NpcTemplate extends L2CharTemplate
 		_hasgeneralskills=true;
 		_hasgeneralskills=true;
 	}
 	}
 	
 	
-	public void addSuesideSkill(L2Skill skill)
+	public void addSuicideSkill(L2Skill skill)
 	{
 	{
-		if (_suesideskills == null)
-			_suesideskills = new FastList<L2Skill>();
-		_suesideskills.add(skill);
+		if (_suicideSkills == null)
+			_suicideSkills = new FastList<L2Skill>();
+		_suicideSkills.add(skill);
 		
 		
-		_hassuesideskills = true;
+		_hasSuicideSkills = true;
 	}
 	}
 	
 	
-	
 	public void addRangeSkill(L2Skill skill)
 	public void addRangeSkill(L2Skill skill)
 	{
 	{
 		if (skill.getCastRange() <= 150 && skill.getCastRange() > 0)
 		if (skill.getCastRange() <= 150 && skill.getCastRange() > 0)
@@ -987,8 +986,13 @@ public final class L2NpcTemplate extends L2CharTemplate
 		return (race == Race.UNDEAD);
 		return (race == Race.UNDEAD);
 	}
 	}
 	
 	
-	public boolean hasSuesideSkill()
+	public FastList<L2Skill> getSuicideSkills()
+	{
+		return _suicideSkills;
+	}
+	
+	public boolean hasSuicideSkill()
 	{
 	{
-		return _hassuesideskills;
+		return _hasSuicideSkills;
 	}
 	}
 }
 }