Baium don't give raid curse.

Replace custom messages with system messages.
Clean up.

L2_GameServer/java/com/l2jserver/gameserver/GmListTable.java

@@ -124,39 +124,31 @@ public class GmListTable
 	
 	public void sendListToPlayer(L2PcInstance player)
 	{
-		if (!isGmOnline(player.isGM()))
+		if (isGmOnline(player.isGM()))
 		{
-			SystemMessage sm = new SystemMessage(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW); //There are not any GMs that are providing customer service currently.
-			player.sendPacket(sm);
-		}
-		else
-		{
-			SystemMessage sm = new SystemMessage(SystemMessageId.GM_LIST);
-			player.sendPacket(sm);
+			player.sendPacket(new SystemMessage(SystemMessageId.GM_LIST));
 			
 			for (String name : getAllGmNames(player.isGM()))
 			{
-				sm = new SystemMessage(SystemMessageId.GM_C1);
+				SystemMessage sm = new SystemMessage(SystemMessageId.GM_C1);
 				sm.addString(name);
 				player.sendPacket(sm);
 			}
 		}
+		else
+			player.sendPacket(new SystemMessage(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW));
 	}
 	
 	public static void broadcastToGMs(L2GameServerPacket packet)
 	{
 		for (L2PcInstance gm : getInstance().getAllGms(true))
-		{
 			gm.sendPacket(packet);
-		}
 	}
 	
 	public static void broadcastMessageToGMs(String message)
 	{
 		for (L2PcInstance gm : getInstance().getAllGms(true))
-		{
 			gm.sendMessage(message);
-		}
 	}
 	
 	@SuppressWarnings("synthetic-access")

L2_GameServer/java/com/l2jserver/gameserver/model/Elementals.java

@@ -114,7 +114,8 @@ public final class Elementals
 		9568
 	};
 
-	public final static int[] ROUGHORES = {
+	public final static int[] ROUGHORES =
+	{
 		10521,
 		10522,
 		10524,
@@ -226,40 +227,22 @@ public final class Elementals
 			switch (_elementalType)
 			{
 				case FIRE:
-					if (isArmor)
-						player.addStatFunc(new FuncAdd(Stats.FIRE_RES, 0x40, this, new LambdaConst(_elementalValue)));
-					else
-						player.addStatFunc(new FuncAdd(Stats.FIRE_POWER, 0x40, this, new LambdaConst(_elementalValue)));
+					player.addStatFunc(new FuncAdd(isArmor ? Stats.FIRE_RES : Stats.FIRE_POWER, 0x40, this, new LambdaConst(_elementalValue)));
 					break;
 				case WATER:
-					if (isArmor)
-						player.addStatFunc(new FuncAdd(Stats.WATER_RES, 0x40, this, new LambdaConst(_elementalValue)));
-					else
-						player.addStatFunc(new FuncAdd(Stats.WATER_POWER, 0x40, this, new LambdaConst(_elementalValue)));
+					player.addStatFunc(new FuncAdd(isArmor ? Stats.WATER_RES : Stats.WATER_POWER, 0x40, this, new LambdaConst(_elementalValue)));
 					break;
 				case WIND:
-					if (isArmor)
-						player.addStatFunc(new FuncAdd(Stats.WIND_RES, 0x40, this, new LambdaConst(_elementalValue)));
-					else
-						player.addStatFunc(new FuncAdd(Stats.WIND_POWER, 0x40, this, new LambdaConst(_elementalValue)));
+					player.addStatFunc(new FuncAdd(isArmor ? Stats.WIND_RES : Stats.WIND_POWER, 0x40, this, new LambdaConst(_elementalValue)));
 					break;
 				case EARTH:
-					if (isArmor)
-						player.addStatFunc(new FuncAdd(Stats.EARTH_RES, 0x40, this, new LambdaConst(_elementalValue)));
-					else
-						player.addStatFunc(new FuncAdd(Stats.EARTH_POWER, 0x40, this, new LambdaConst(_elementalValue)));
+					player.addStatFunc(new FuncAdd(isArmor ? Stats.EARTH_RES : Stats.EARTH_POWER, 0x40, this, new LambdaConst(_elementalValue)));
 					break;
 				case DARK:
-					if (isArmor)
-						player.addStatFunc(new FuncAdd(Stats.DARK_RES, 0x40, this, new LambdaConst(_elementalValue)));
-					else
-						player.addStatFunc(new FuncAdd(Stats.DARK_POWER, 0x40, this, new LambdaConst(_elementalValue)));
+					player.addStatFunc(new FuncAdd(isArmor ? Stats.DARK_RES : Stats.DARK_POWER, 0x40, this, new LambdaConst(_elementalValue)));
 					break;
 				case HOLY:
-					if (isArmor)
-						player.addStatFunc(new FuncAdd(Stats.HOLY_RES, 0x40, this, new LambdaConst(_elementalValue)));
-					else
-						player.addStatFunc(new FuncAdd(Stats.HOLY_POWER, 0x40, this, new LambdaConst(_elementalValue)));
+					player.addStatFunc(new FuncAdd(isArmor ? Stats.HOLY_RES : Stats.HOLY_POWER, 0x40, this, new LambdaConst(_elementalValue)));
 					break;
 			}
 			

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5170,7 +5170,8 @@ public abstract class L2Character extends L2Object
 			// Check Raidboss attack
 			// Character will be petrified if attacking a raid that's more
 			// than 8 levels lower
-			if (target.isRaid() && !Config.RAID_DISABLE_CURSE && getActingPlayer() != null)
+			if (target.isRaid() && !Config.RAID_DISABLE_CURSE && getActingPlayer() != null
+					&& ((L2Npc)target).getNpcId() != 29020) // Baium do not give raid curse.
 			{
 				int level = getActingPlayer().getLevel();
 
@@ -6374,6 +6375,7 @@ public abstract class L2Character extends L2Object
 						targetsCastTarget = target.getAI().getCastTarget();
 					}
 					if (!Config.RAID_DISABLE_CURSE
+							&& ((L2Npc)target).getNpcId() != 29020 // Baium dont give raid curse.
 							&& ((target.isRaid() && getLevel() > target.getLevel() + 8)
 							||
 							(!skill.isOffensive() && targetsAttackTarget != null && targetsAttackTarget.isRaid() 
@@ -6404,15 +6406,15 @@ public abstract class L2Character extends L2Object
 						return;
 					}
 
-					 // Check if over-hit is possible
-		            if(skill.isOverhit())
-		            {
-		            	if(target instanceof L2Attackable)
-		                        ((L2Attackable)target).overhitEnabled(true);
-		            }
+					// Check if over-hit is possible
+					if (skill.isOverhit())
+					{
+						if (target instanceof L2Attackable)
+							((L2Attackable)target).overhitEnabled(true);
+					}
 
-		            // crafting does not trigger any chance skills
-		            // possibly should be unhardcoded
+					// crafting does not trigger any chance skills
+					// possibly should be unhardcoded
 					switch (skill.getSkillType())
 					{
 						case COMMON_CRAFT:
@@ -6424,7 +6426,9 @@ public abstract class L2Character extends L2Object
 							{
 								if (activeWeapon.getSkillEffects(this, target, skill).length > 0 && this instanceof L2PcInstance)
 								{
-									sendMessage("Target affected by weapon special ability!");
+									SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED);
+									sm.addSkillName(skill);
+									sendPacket(sm);
 								}
 							}
 

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -428,132 +428,133 @@ public class L2Npc extends L2Character
 
     }
     
-    public FastList<L2Skill> getLrangeSkill()
-    {
-    	FastList<L2Skill> skilldata = new FastList <L2Skill>();
-    	boolean hasLrange = false;
-    	L2NpcTemplate npcData = NpcTable.getInstance().getTemplate(getTemplate().npcId);
-    	L2NpcAIData AI = npcData.getAIDataStatic();
+	public FastList<L2Skill> getLrangeSkill()
+	{
+		FastList<L2Skill> skilldata = new FastList <L2Skill>();
+		boolean hasLrange = false;
+		L2NpcTemplate npcData = NpcTable.getInstance().getTemplate(getTemplate().npcId);
+		L2NpcAIData AI = npcData.getAIDataStatic();
 
-    		if(AI == null || AI.getLongRangeSkill() == 0)
-    			return null;
-
-    		switch(AI.getLongRangeSkill())
-    		{
-    			case -1:
-    			{
-					L2Skill[] skills = null;
-    	    		skills = getAllSkills();
-    	    		if(skills != null)
-    				for (L2Skill sk: skills)
-    				{
-    					if(sk == null || sk.getSkillType() == L2SkillType.PASSIVE
-    					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
-    					{
-    						continue;
-    					}
-    					if(sk.getCastRange()>=200)
-    					{
-    						skilldata.add(sk);	
-    						hasLrange = true;
-    					}
-    				}
-    	    		break;
-    			}
-    			case 1:
-    			{
-    				if(npcData._universalskills != null)
-    				for (L2Skill sk: npcData._universalskills)
-    				{
-    					if(sk.getCastRange()>=200)
-    					{
-    						skilldata.add(sk);	
-    						hasLrange = true;
-    					}
-    				}
-    				break;
-    			}
-    			default:
-    			{
-    				for (L2Skill sk: this.getAllSkills())
-    				{
-    					if(sk.getId() == AI.getLongRangeSkill())
-    					{
-    						skilldata.add(sk);	
-    						hasLrange = true;
-    					}
-    				}
-    			}
-    		}
-
-    	if(hasLrange)
-    	return skilldata;
-    	else return null;
-    }
-    
-    public FastList<L2Skill> getSrangeSkill()
-    {
-    	FastList<L2Skill> skilldata = new FastList <L2Skill>();
-    	boolean hasSrange = false;
-    	L2NpcTemplate npcData = NpcTable.getInstance().getTemplate(getTemplate().npcId);
-    	L2NpcAIData AI = npcData.getAIDataStatic();
+		if (AI == null || AI.getLongRangeSkill() == 0)
+			return null;
 
-    		if(AI == null || AI.getShortRangeSkill() == 0)
-    			return null;
-
-    		switch(AI.getShortRangeSkill())
-    		{
-    			case -1:
-    			{
-					L2Skill[] skills = null;
-    	    		skills = getAllSkills();
-    	    		if(skills != null)
-    				for (L2Skill sk: skills)
-    				{
-    					if(sk == null || sk.getSkillType() == L2SkillType.PASSIVE
-    					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
-    					{
-    						continue;
-    					}
-    					if(sk.getCastRange()<=200)
-    					{
-    						skilldata.add(sk);	
-    						hasSrange = true;
-    					}
-    				}
-    	    		break;
-    			}
-    			case 1:
-    			{
-    				if(npcData._universalskills != null)
-    				for (L2Skill sk: npcData._universalskills)
-    				{
-    					if(sk.getCastRange()<=200)
-    					{
-    						skilldata.add(sk);	
-    						hasSrange = true;
-    					}
-    				}
-    				break;
-    			}
-    			default:
-    			{
-    				for (L2Skill sk: this.getAllSkills())
-    				{
-    					if(sk.getId() == AI.getShortRangeSkill())
-    					{
-    						skilldata.add(sk);	
-    						hasSrange = true;
-    					}
-    				}
-    			}
-    		}
-    		
-    	
-    	if(hasSrange)
-    	return skilldata;
-    	else return null;
-    }
+		switch (AI.getLongRangeSkill())
+		{
+			case -1:
+			{
+				L2Skill[] skills = null;
+				skills = getAllSkills();
+				if (skills != null)
+				{
+					for (L2Skill sk: skills)
+					{
+						if (sk == null || sk.isPassive()
+								|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+							continue;
+
+						if (sk.getCastRange() >= 200)
+						{
+							skilldata.add(sk);	
+							hasLrange = true;
+						}
+					}
+				}
+				break;
+			}
+			case 1:
+			{
+				if (npcData._universalskills != null)
+				{
+					for (L2Skill sk: npcData._universalskills)
+					{
+						if (sk.getCastRange() >= 200)
+						{
+							skilldata.add(sk);	
+							hasLrange = true;
+						}
+					}
+				}
+				break;
+			}
+			default:
+			{
+				for (L2Skill sk: getAllSkills())
+				{
+					if (sk.getId() == AI.getLongRangeSkill())
+					{
+						skilldata.add(sk);	
+						hasLrange = true;
+					}
+				}
+			}
+		}
+
+		return (hasLrange ? skilldata : null);
+	}
+
+	public FastList<L2Skill> getSrangeSkill()
+	{
+		FastList<L2Skill> skilldata = new FastList <L2Skill>();
+		boolean hasSrange = false;
+		L2NpcTemplate npcData = NpcTable.getInstance().getTemplate(getTemplate().npcId);
+		L2NpcAIData AI = npcData.getAIDataStatic();
+
+		if (AI == null || AI.getShortRangeSkill() == 0)
+			return null;
+
+		switch (AI.getShortRangeSkill())
+		{
+			case -1:
+			{
+				L2Skill[] skills = null;
+				skills = getAllSkills();
+				if (skills != null)
+				{
+					for (L2Skill sk: skills)
+					{
+						if (sk == null || sk.isPassive()
+								|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+							continue;
+
+						if (sk.getCastRange() <= 200)
+						{
+							skilldata.add(sk);
+							hasSrange = true;
+						}
+					}
+				}
+				break;
+			}
+			case 1:
+			{
+				if (npcData._universalskills != null)
+				{
+					for (L2Skill sk: npcData._universalskills)
+					{
+						if (sk.getCastRange() <= 200)
+						{
+							skilldata.add(sk);	
+							hasSrange = true;
+						}
+					}
+				}
+				break;
+			}
+			default:
+			{
+				for (L2Skill sk: getAllSkills())
+				{
+					if (sk.getId() == AI.getShortRangeSkill())
+					{
+						skilldata.add(sk);	
+						hasSrange = true;
+					}
+				}
+			}
+		}
+
+		return (hasSrange ? skilldata : null);
+	}
     
 	/** Task launching the function onRandomAnimation() */
 	protected class RandomAnimationTask implements Runnable

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java

@@ -171,9 +171,7 @@ public class L2AirShipInstance extends L2Character
 				return bp.time;
 			}
 			else
-			{
 				return 0;
-			}
 		}
 		
 	}
@@ -344,7 +342,6 @@ public class L2AirShipInstance extends L2Character
 					teleportAirShip(-157261,255664,221,64781);
 					AirShiprun asr = new AirShiprun(0, _airShip);
 					ThreadPoolManager.getInstance().scheduleGeneral(asr, 5000);
-
 				}
 				else
 					_state++;
@@ -390,16 +387,10 @@ public class L2AirShipInstance extends L2Character
 		switch (npcId)
 		{
 			case 32607:
-				if (isArraived)
-					message = "The regurarly scheduled airship has arrived. It will depart for the Aden continent in 1 minute. ";
-				else
-					message = "The regurarly scheduled airship that flies to the Aden continent has departed.";
+				message = (isArraived ? "The regurarly scheduled airship has arrived. It will depart for the Aden continent in 1 minute." : "The regurarly scheduled airship that flies to the Aden continent has departed.");
 				break;
 			case 32609:
-				if (isArraived)
-					message = "The regurarly scheduled airship has arrived. It will depart for the Gracia continent in 1 minute. ";
-				else
-					message = "The regurarly scheduled airship that flies to the Gracia continent has departed.";
+				message = (isArraived ? "The regurarly scheduled airship has arrived. It will depart for the Gracia continent in 1 minute." : "The regurarly scheduled airship that flies to the Gracia continent has departed.");
 				break;
 			default:
 				_log.warning("Invalid AirShipController npcId: " + npcId);
@@ -573,68 +564,76 @@ public class L2AirShipInstance extends L2Character
 			player.sendPacket(new ExAirShipInfo(this));
 		}
 	}
+	
 	@Override
 	public void updateAbnormalEffect()
 	{
 	}
+	
 	@Override
 	public L2ItemInstance getActiveWeaponInstance()
 	{
 		return null;
 	}
+	
 	@Override
 	public L2Weapon getActiveWeaponItem()
 	{
 		return null;
 	}
+	
 	@Override
 	public L2ItemInstance getSecondaryWeaponInstance()
 	{
 		return null;
 	}
+	
 	@Override
 	public L2Weapon getSecondaryWeaponItem()
 	{
 		return null;
 	}
+	
 	@Override
 	public int getLevel()
 	{
 		return 0;
 	}
+	
 	@Override
 	public boolean isAutoAttackable(L2Character attacker)
 	{
 		return false;
 	}
+	
 	@Override
 	public void setAI(L2CharacterAI newAI)
 	{
 		if (_ai == null)
 			_ai = newAI;
 	}
+	
 	public class AIAccessor extends L2Character.AIAccessor
 	{
 		@Override
 		public void detachAI()
 		{}
 	}
-
-    public int getSpeed1()
-    {
-	    return 300;
-    }
-    public int getSpeed2()
-    {
-	    return 4000;
-    }
+	
+	public int getSpeed1()
+	{
+		return 300;
+	}
+	
+	public int getSpeed2()
+	{
+		return 4000;
+	}
     
-    @Override
-    public void sendInfo(L2PcInstance activeChar)
-    {
-    	if(this != activeChar.getAirShip())
-    	{
-    		activeChar.sendPacket(new ExAirShipInfo(this));
-    	}
-    }
+	@Override
+	public void sendInfo(L2PcInstance activeChar)
+	{
+		if (this != activeChar.getAirShip())
+			activeChar.sendPacket(new ExAirShipInfo(this));
+	}
 }

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Message.java

@@ -86,10 +86,7 @@ public class Message
 		_receiverId = receiverId;
 		_subject = subject;
 		_content = text;
-		if (isCod)
-			_expiration = System.currentTimeMillis() + COD_EXPIRATION * 3600000;
-		else
-			_expiration = System.currentTimeMillis() + EXPIRATION * 3600000;
+		_expiration = (isCod ? System.currentTimeMillis() + COD_EXPIRATION * 3600000 : System.currentTimeMillis() + EXPIRATION * 3600000);
 		_hasAttachments = false;
 		_unread = true;
 		_deletedBySender = false;
@@ -231,9 +228,7 @@ public class Message
 		{
 			_deletedBySender = true;
 			if (_deletedByReceiver)
-			{
 				MailManager.getInstance().deleteMessageInDb(_messageId);
-			}
 			else
 				MailManager.getInstance().markAsDeletedBySenderInDb(_messageId);
 		}
@@ -250,9 +245,7 @@ public class Message
 		{
 			_deletedByReceiver = true;
 			if (_deletedBySender)
-			{
 				MailManager.getInstance().deleteMessageInDb(_messageId);
-			}
 			else
 				MailManager.getInstance().markAsDeletedByReceiverInDb(_messageId);
 		}

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/AbstractEnchantPacket.java

@@ -147,7 +147,7 @@ public abstract class AbstractEnchantPacket extends L2GameClientPacket
 		{
 			// blessed scrolls can't use support items
 			if (supportItem != null && (!supportItem.isValid(enchantItem) || isBlessed()))
-					return false;
+				return false;
 
 			return isValid(enchantItem);
 		}

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java

@@ -96,10 +96,10 @@ public final class RequestStopPledgeWar extends L2GameClientPacket
 				continue;
 			if (AttackStanceTaskManager.getInstance().getAttackStanceTask(member.getPlayerInstance()))
 			{
-				player.sendMessage("Cannot cancel war while members are fighting.");
+				player.sendPacket(new SystemMessage(SystemMessageId.CANT_STOP_CLAN_WAR_WHILE_IN_COMBAT));
 				return;
 			}
-		}		
+		}
 		
 		ClanTable.getInstance().deleteclanswars(playerClan.getClanId(), clan.getClanId());
 		Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();

L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/writepackets/InitWorldInfo.java

@@ -55,10 +55,7 @@ public final class InitWorldInfo extends BaseWritePacket
 				super.writeD(info);
 				break;
 			case TYPE_CLAN:
-				if (info != -1)
-					super.writeD(info);
-				else
-					super.writeD(clans.length);
+				super.writeD(info != -1 ? info : clans.length);
 				i = 0;
 				for (L2Clan c : clans)
 				{
@@ -83,10 +80,7 @@ public final class InitWorldInfo extends BaseWritePacket
 				}
 				break;
 			case TYPE_PLAYER:
-				if (info != -1)
-					super.writeD(info);
-				else
-					super.writeD(players.length);
+				super.writeD(info != -1 ? info : players.length);
 				i = 0;
 				for (StatsSet p : players)
 				{
@@ -102,7 +96,8 @@ public final class InitWorldInfo extends BaseWritePacket
 					java.sql.Connection con = null;
 					FastList<Integer> list = new FastList<Integer>();
 					
-					try {
+					try
+					{
 						con = L2DatabaseFactory.getInstance().getConnection();
 						PreparedStatement statement;
 						statement = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=?");