Selaa lähdekoodia

BETA: Code format for [5237]

Rumen Nikiforov 13 vuotta sitten
vanhempi
sitoutus
2dd86437a2
42 muutettua tiedostoa jossa 406 lisäystä ja 190 poistoa
  1. 8 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java
  2. 43 23
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java
  3. 35 26
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java
  4. 3 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Playable.java
  5. 33 21
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  6. 4 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java
  7. 11 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java
  8. 14 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java
  9. 14 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/TvTEvent.java
  10. 33 20
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java
  11. 10 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
  12. 27 14
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java
  13. 2 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java
  14. 9 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Say2.java
  15. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/AddToInventoryEvent.java
  16. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/AttackEvent.java
  17. 5 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/AugmentEvent.java
  18. 8 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ChatEvent.java
  19. 2 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanCreationEvent.java
  20. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanJoinEvent.java
  21. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanLeaderChangeEvent.java
  22. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanLeaveEvent.java
  23. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanLevelUpEvent.java
  24. 5 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarEvent.java
  25. 8 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarehouseAddItemEvent.java
  26. 9 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarehouseDeleteItemEvent.java
  27. 10 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarehouseTransferEvent.java
  28. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/DeathEvent.java
  29. 4 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/EquipmentEvent.java
  30. 4 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/FortSiegeEvent.java
  31. 5 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/HennaEvent.java
  32. 10 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemCreateEvent.java
  33. 3 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemDestroyEvent.java
  34. 9 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemDropEvent.java
  35. 10 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemPickupEvent.java
  36. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemTransferEvent.java
  37. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/PlayerLevelChangeEvent.java
  38. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ProfessionChangeEvent.java
  39. 4 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/SiegeEvent.java
  40. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/SkillUseEvent.java
  41. 4 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/TransformEvent.java
  42. 6 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/TvtKillEvent.java

+ 8 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -273,9 +273,11 @@ public class ItemTable
 	 */
 	public L2ItemInstance createItem(String process, int itemId, long count, L2PcInstance actor, Object reference)
 	{
-		if(!fireNewItemListeners(process,itemId,count,actor,reference)){
+		if(!fireNewItemListeners(process,itemId,count,actor,reference))
+		{
 			return null;
 		}
+		
 		// Create and Init the L2ItemInstance corresponding to the Item Identifier
 		L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId);
 		
@@ -499,8 +501,10 @@ public class ItemTable
 	 * @param reference
 	 * @return
 	 */
-	private boolean fireNewItemListeners(String process, int itemId, long count, L2PcInstance actor, Object reference){
-		if(!newItemListeners.isEmpty() && actor != null){
+	private boolean fireNewItemListeners(String process, int itemId, long count, L2PcInstance actor, Object reference)
+	{
+		if (!newItemListeners.isEmpty() && actor != null)
+		{
 			ItemCreateEvent event = new ItemCreateEvent();
 			event.setItemId(itemId);
 			event.setPlayer(actor);
@@ -518,6 +522,7 @@ public class ItemTable
 		}
 		return true;
 	}
+	
 	/**
 	 * Adds a new item listener
 	 * @param listener

+ 43 - 23
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -275,7 +275,8 @@ public class L2Clan
 		
 		L2PcInstance exLeader = getLeader().getPlayerInstance();
 		L2PcInstance newLeader = member.getPlayerInstance();
-		if(!fireClanLeaderChangeListeners(newLeader,exLeader)){
+		if (!fireClanLeaderChangeListeners(newLeader, exLeader))
+		{
 			return;
 		}
 		
@@ -368,7 +369,8 @@ public class L2Clan
 	 */
 	public void addClanMember(L2PcInstance player)
 	{
-		if(!fireClanJoinListeners(player)){
+		if (!fireClanJoinListeners(player))
+		{
 			return;
 		}
 		
@@ -429,7 +431,8 @@ public class L2Clan
 	 */
 	public void removeClanMember(int objectId, long clanJoinExpiryTime)
 	{
-		if(!fireClanLeaveListeners(objectId)){
+		if (!fireClanLeaveListeners(objectId))
+		{
 			return;
 		}
 		
@@ -1496,7 +1499,8 @@ public class L2Clan
 	
 	public void setEnemyClan(L2Clan clan)
 	{
-		if(!fireClanWarStartListeners(clan)){
+		if (!fireClanWarStartListeners(clan))
+		{
 			return;
 		}
 		Integer id = clan.getClanId();
@@ -1505,7 +1509,8 @@ public class L2Clan
 	
 	public void setEnemyClan(Integer clan)
 	{
-		if(!fireClanWarStartListeners(ClanTable.getInstance().getClan(clan))){
+		if (!fireClanWarStartListeners(ClanTable.getInstance().getClan(clan)))
+		{
 			return;
 		}
 		_atWarWith.add(clan);
@@ -1524,7 +1529,8 @@ public class L2Clan
 	
 	public void deleteEnemyClan(L2Clan clan)
 	{
-		if(!fireClanWarEndListeners(clan)){
+		if (!fireClanWarEndListeners(clan))
+		{
 			return;
 		}
 		Integer id = clan.getClanId();
@@ -2438,7 +2444,8 @@ public class L2Clan
 		
 		boolean increaseClanLevel = false;
 		
-		if(!fireClanLevelUpListeners()){
+		if (!fireClanLevelUpListeners())
+		{
 			return false;
 		}
 		
@@ -2919,8 +2926,10 @@ public class L2Clan
 	/**
 	 * Fires the clan creation listeners, if any.
 	 */
-	private void fireClanCreationListeners(){
-		if(!clanCreationListeners.isEmpty()){
+	private void fireClanCreationListeners()
+	{
+		if (!clanCreationListeners.isEmpty())
+		{
 			ClanCreationEvent event = new ClanCreationEvent();
 			event.setClan(this);
 			for (ClanCreationListener listener : clanCreationListeners)
@@ -2931,14 +2940,15 @@ public class L2Clan
 	}
 	
 	/**
-	 * Fires all the ClanMemberShipListener.onLeaderChange() methods, if any.
-	 * Prevents the clan leader change if it returns false;
+	 * Fires all the ClanMemberShipListener.onLeaderChange() methods, if any. Prevents the clan leader change if it returns false;
 	 * @param newLeader
 	 * @param exLeader
 	 * @return
 	 */
-	private boolean fireClanLeaderChangeListeners(L2PcInstance newLeader, L2PcInstance exLeader){
-		if(!clanMembershipListeners.isEmpty() && newLeader != null && exLeader != null){
+	private boolean fireClanLeaderChangeListeners(L2PcInstance newLeader, L2PcInstance exLeader)
+	{
+		if (!clanMembershipListeners.isEmpty() && newLeader != null && exLeader != null)
+		{
 			ClanLeaderChangeEvent event = new ClanLeaderChangeEvent();
 			event.setClan(this);
 			event.setNewLeader(newLeader);
@@ -2960,8 +2970,10 @@ public class L2Clan
 	 * @param player
 	 * @return
 	 */
-	private boolean fireClanJoinListeners(L2PcInstance player){
-		if(!clanMembershipListeners.isEmpty() && player != null){
+	private boolean fireClanJoinListeners(L2PcInstance player)
+	{
+		if (!clanMembershipListeners.isEmpty() && player != null)
+		{
 			ClanJoinEvent event = new ClanJoinEvent();
 			event.setClan(this);
 			event.setPlayer(player);
@@ -2982,8 +2994,10 @@ public class L2Clan
 	 * @param objectId - the clan member's objectId
 	 * @return
 	 */
-	private boolean fireClanLeaveListeners(int objectId){
-		if(!clanMembershipListeners.isEmpty()){
+	private boolean fireClanLeaveListeners(int objectId)
+	{
+		if (!clanMembershipListeners.isEmpty())
+		{
 			ClanLeaveEvent event = new ClanLeaveEvent();
 			event.setPlayerId(objectId);
 			event.setClan(this);
@@ -3004,8 +3018,10 @@ public class L2Clan
 	 * @param clan -> the new enemy clan
 	 * @return
 	 */
-	private boolean fireClanWarStartListeners(L2Clan clan){
-		if(!clanWarListeners.isEmpty() && clan != null){
+	private boolean fireClanWarStartListeners(L2Clan clan)
+	{
+		if (!clanWarListeners.isEmpty() && clan != null)
+		{
 			ClanWarEvent event = new ClanWarEvent();
 			event.setClan1(this);
 			event.setClan2(clan);
@@ -3027,8 +3043,10 @@ public class L2Clan
 	 * @param clan -> the enemy clan
 	 * @return
 	 */
-	private boolean fireClanWarEndListeners(L2Clan clan){
-		if(!clanWarListeners.isEmpty() && clan != null){
+	private boolean fireClanWarEndListeners(L2Clan clan)
+	{
+		if (!clanWarListeners.isEmpty() && clan != null)
+		{
 			ClanWarEvent event = new ClanWarEvent();
 			event.setClan1(this);
 			event.setClan2(clan);
@@ -3049,8 +3067,10 @@ public class L2Clan
 	 * Blocks the level up if it returns false
 	 * @return
 	 */
-	private boolean fireClanLevelUpListeners(){
-		if(!clanCreationListeners.isEmpty()){
+	private boolean fireClanLevelUpListeners()
+	{
+		if (!clanCreationListeners.isEmpty())
+		{
 			ClanLevelUpEvent event = new ClanLevelUpEvent();
 			event.setClan(this);
 			event.setOldLevel(_level);

+ 35 - 26
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1784,7 +1784,8 @@ public abstract class L2Character extends L2Object
 		
 	private void beginCast(L2Skill skill, boolean simultaneously, L2Character target, L2Object[] targets)
 	{
-		if(!fireSkillCastListeners(skill,simultaneously,target,targets)){
+		if (!fireSkillCastListeners(skill, simultaneously, target, targets))
+		{
 			return;
 		}
 		if (target == null)
@@ -2320,7 +2321,8 @@ public abstract class L2Character extends L2Object
 			setCurrentHp(0);
 			setIsDead(true);
 		}
-		if(!fireDeathListeners(killer)){
+		if (!fireDeathListeners(killer))
+		{
 			return false;
 		}
 		
@@ -7646,13 +7648,14 @@ public abstract class L2Character extends L2Object
 	// LISTENERS
 	
 	/**
-	 * Fires the attack listeners, if any.
-	 * Returns false if the attack is to be blocked.
+	 * Fires the attack listeners, if any. Returns false if the attack is to be blocked.
 	 * @param target
 	 * @return
 	 */
-	private boolean fireAttackListeners(L2Character target){
-		if(target != null && (!attackListeners.isEmpty() || !target.getAttackListeners().isEmpty())){
+	private boolean fireAttackListeners(L2Character target)
+	{
+		if (target != null && (!attackListeners.isEmpty() || !target.getAttackListeners().isEmpty()))
+		{
 			AttackEvent event = new AttackEvent();
 			event.setTarget(target);
 			event.setAttacker(this);
@@ -7675,54 +7678,58 @@ public abstract class L2Character extends L2Object
 	}
 	
 	/**
-	 * Fires the skill cast listeners, if any.
-	 * Returns false if the attack is to be blocked.
+	 * Fires the skill cast listeners, if any. Returns false if the attack is to be blocked.
 	 * @param skill
 	 * @param simultaneously
 	 * @param target
 	 * @param targets
 	 * @return
 	 */
-	private boolean fireSkillCastListeners(L2Skill skill, boolean simultaneously, L2Character target, L2Object[] targets){
-		if(skill != null && (target != null || targets.length != 0) && (!skillUseListeners.isEmpty() || !globalSkillUseListeners.isEmpty())){
+	private boolean fireSkillCastListeners(L2Skill skill, boolean simultaneously, L2Character target, L2Object[] targets)
+	{
+		if (skill != null && (target != null || targets.length != 0) && (!skillUseListeners.isEmpty() || !globalSkillUseListeners.isEmpty()))
+		{
 			int arraySize = (target == null ? 0 : 1) + (targets == null ? 0 : targets.length);
 			L2Object[] t = new L2Object[arraySize];
 			int i = 0;
-			if(target != null){
+			if (target != null)
+			{
 				t[0] = target;
-				i ++;
+				i++;
 			}
-			if(targets != null){
-				for(int f=0; f<targets.length; f++){
-					t[f+i] = targets[f]; 
+			if (targets != null)
+			{
+				for (int f = 0; f < targets.length; f++)
+				{
+					t[f + i] = targets[f];
 				}
 			}
-			if(targets.length > 0){
+			if (targets.length > 0)
+			{
 				SkillUseEvent event = new SkillUseEvent();
 				event.setCaster(this);
 				event.setSkill(skill);
 				event.setTargets(t);
-				for(SkillUseListener listener : skillUseListeners)
+				for (SkillUseListener listener : skillUseListeners)
 				{
 					int skillId = skill.getId();
-					if(listener.getSkillId() == -1 || skillId == listener.getSkillId())
+					if (listener.getSkillId() == -1 || skillId == listener.getSkillId())
 					{
-						if(!listener.onSkillUse(event))
+						if (!listener.onSkillUse(event))
 						{
 							return false;
 						}
 					}
 				}
-				for(SkillUseListener listener : globalSkillUseListeners)
+				for (SkillUseListener listener : globalSkillUseListeners)
 				{
 					int npcId = listener.getNpcId();
 					int skillId = listener.getSkillId();
 					boolean skillOk = skillId == -1 || skillId == skill.getId();
-					boolean charOk = (npcId == -1 && this instanceof L2NpcInstance) || (npcId == -2 && this instanceof L2PcInstance) || 
-						npcId == -3 || (this instanceof L2NpcInstance && ((L2NpcInstance)this).getNpcId() == npcId);
-					if(skillOk && charOk)
+					boolean charOk = (npcId == -1 && this instanceof L2NpcInstance) || (npcId == -2 && this instanceof L2PcInstance) || npcId == -3 || (this instanceof L2NpcInstance && ((L2NpcInstance) this).getNpcId() == npcId);
+					if (skillOk && charOk)
 					{
-						if(!listener.onSkillUse(event))
+						if (!listener.onSkillUse(event))
 						{
 							return false;
 						}
@@ -7740,8 +7747,10 @@ public abstract class L2Character extends L2Object
 	 * @param killer
 	 * @return
 	 */
-	public boolean fireDeathListeners(L2Character killer){
-		if(killer != null && (!deathListeners.isEmpty() || !globalDeathListeners.isEmpty() || !killer.getDeathListeners().isEmpty())){
+	public boolean fireDeathListeners(L2Character killer)
+	{
+		if (killer != null && (!deathListeners.isEmpty() || !globalDeathListeners.isEmpty() || !killer.getDeathListeners().isEmpty()))
+		{
 			DeathEvent event = new DeathEvent();
 			event.setKiller(killer);
 			event.setVictim(this);

+ 3 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Playable.java

@@ -92,7 +92,7 @@ public abstract class L2Playable extends L2Character
 	
 	@Override
 	public boolean doDie(L2Character killer)
-	{		
+	{
 		// killing is only possible one time
 		synchronized (this)
 		{
@@ -107,7 +107,8 @@ public abstract class L2Playable extends L2Character
 		 * This needs to stay here because it overrides L2Character.doDie() and does 
 		 * not call for super.doDie()
 		 */
-		if(!super.fireDeathListeners(killer)){
+		if (!super.fireDeathListeners(killer))
+		{
 			return false;
 		}
 		

+ 33 - 21
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -5061,7 +5061,8 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(msg);
 			return;
 		}
-		if(!fireTransformListeners(transformation,true)){
+		if (!fireTransformListeners(transformation, true))
+		{
 			return;
 		}
 
@@ -5086,7 +5087,8 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (_transformation != null)
 		{
-			if(!fireTransformListeners(_transformation,false)){
+			if (!fireTransformListeners(_transformation, false))
+			{
 				return;
 			}
 			setQueuedSkill(null, false, false);
@@ -8597,7 +8599,8 @@ public final class L2PcInstance extends L2Playable
 	 */
 	public boolean removeHenna(int slot)
 	{
-		if(!fireHennaListeners(getHenna(slot+1),false)){
+		if (!fireHennaListeners(getHenna(slot + 1), false))
+		{
 			return false;
 		}
 		if (slot < 1 || slot > 3)
@@ -8665,7 +8668,8 @@ public final class L2PcInstance extends L2Playable
 	 */
 	public boolean addHenna(L2HennaInstance henna)
 	{
-		if(!fireHennaListeners(henna,true)){
+		if (!fireHennaListeners(henna, true))
+		{
 			return false;
 		}
 		for (int i = 0; i < 3; i++)
@@ -15550,19 +15554,21 @@ public final class L2PcInstance extends L2Playable
 	 * @param item
 	 * @return
 	 */
-	private boolean fireEquipmentListeners(boolean isEquiped, L2ItemInstance item){
-		if(item != null){
+	private boolean fireEquipmentListeners(boolean isEquiped, L2ItemInstance item)
+	{
+		if (item != null)
+		{
 			EquipmentEvent event = new EquipmentEvent();
 			event.setEquipped(!isEquiped);
 			event.setItem(item);
-			for(EquipmentListener listener : equipmentListeners)
+			for (EquipmentListener listener : equipmentListeners)
 			{
-				if(!listener.onEquip(event))
+				if (!listener.onEquip(event))
 					return false;
 			}
-			for(EquipmentListener listener : globalEquipmentListeners)
+			for (EquipmentListener listener : globalEquipmentListeners)
 			{
-				if(!listener.onEquip(event))
+				if (!listener.onEquip(event))
 					return false;
 			}
 		}
@@ -15576,14 +15582,16 @@ public final class L2PcInstance extends L2Playable
 	 * @param isTransforming
 	 * @return
 	 */
-	private boolean fireTransformListeners(L2Transformation transformation, boolean isTransforming){
-		if(transformation != null && !transformListeners.isEmpty()){
+	private boolean fireTransformListeners(L2Transformation transformation, boolean isTransforming)
+	{
+		if (transformation != null && !transformListeners.isEmpty())
+		{
 			TransformEvent event = new TransformEvent();
 			event.setTransformation(transformation);
 			event.setTransforming(isTransforming);
-			for(TransformListener listener : transformListeners)
+			for (TransformListener listener : transformListeners)
 			{
-				if(!listener.onTransform(event))
+				if (!listener.onTransform(event))
 					return false;
 			}
 		}
@@ -15597,27 +15605,31 @@ public final class L2PcInstance extends L2Playable
 	 * @param isAdding
 	 * @return
 	 */
-	private boolean fireHennaListeners(L2HennaInstance henna, boolean isAdding){
-		if(henna != null && !hennaListeners.isEmpty()){
+	private boolean fireHennaListeners(L2HennaInstance henna, boolean isAdding)
+	{
+		if (henna != null && !hennaListeners.isEmpty())
+		{
 			HennaEvent event = new HennaEvent();
 			event.setAdd(isAdding);
 			event.setHenna(henna);
 			event.setPlayer(this);
-			for(HennaListener listener : hennaListeners)
+			for (HennaListener listener : hennaListeners)
 			{
-				if(!listener.onRemoveHenna(event))
+				if (!listener.onRemoveHenna(event))
 					return false;
 			}
 		}
-		return true;	
+		return true;
 	}
 	
 	/**
 	 * Fires all the profession change listeners
 	 * @param t
 	 */
-	private void fireProfessionChangeListeners(L2PcTemplate t){
-		if(!professionChangeListeners.isEmpty() || !globalProfessionChangeListeners.isEmpty()){
+	private void fireProfessionChangeListeners(L2PcTemplate t)
+	{
+		if (!professionChangeListeners.isEmpty() || !globalProfessionChangeListeners.isEmpty())
+		{
 			ProfessionChangeEvent event = null;
 			event = new ProfessionChangeEvent();
 			event.setPlayer(this);

+ 4 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java

@@ -715,8 +715,10 @@ public class PcStat extends PlayableStat
 	 * Fires all the level change listeners, if any.
 	 * @param value
 	 */
-	private void fireLevelChangeListeners(byte value){
-		if(!levelListeners.isEmpty() || !globalLevelListeners.isEmpty()){
+	private void fireLevelChangeListeners(byte value)
+	{
+		if (!levelListeners.isEmpty() || !globalLevelListeners.isEmpty())
+		{
 			PlayerLevelChangeEvent event = new PlayerLevelChangeEvent();
 			event.setPlayer(getActiveChar());
 			event.setOldLevel(getLevel());

+ 11 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -293,7 +293,8 @@ public class FortSiege implements Siegable
 	{
 		if (!getIsInProgress())
 		{
-			if(!fireFortSiegeEventListeners(EventStage.START)){
+			if (!fireFortSiegeEventListeners(EventStage.START))
+			{
 				return;
 			}
 			if (_siegeStartTask != null) // used admin command "admin_startfortsiege"
@@ -1244,7 +1245,9 @@ public class FortSiege implements Siegable
 	}
 	
 	@Override
-	public void updateSiege() { }
+	public void updateSiege()
+	{
+	}
 	
 	// Listeners
 	/**
@@ -1253,12 +1256,15 @@ public class FortSiege implements Siegable
 	 * @param stage
 	 * @return if onStart() returns false, the siege is cancelled
 	 */
-	private boolean fireFortSiegeEventListeners(EventStage stage){
-		if(!fortSiegeListeners.isEmpty()){
+	private boolean fireFortSiegeEventListeners(EventStage stage)
+	{
+		if (!fortSiegeListeners.isEmpty())
+		{
 			FortSiegeEvent event = new FortSiegeEvent();
 			event.setSiege(this);
 			event.setStage(stage);
-			switch(stage){
+			switch (stage)
+			{
 				case START:
 				{
 					for (FortSiegeListener listener : fortSiegeListeners)

+ 14 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -1673,7 +1673,9 @@ public class Siege implements Siegable
 	}
 	
 	@Override
-	public void updateSiege() { }
+	public void updateSiege()
+	{
+	}
 	
 	// Listeners
 	/**
@@ -1682,17 +1684,20 @@ public class Siege implements Siegable
 	 * @param stage
 	 * @return
 	 */
-	private boolean fireSiegeListeners(EventStage stage){
-		if(!siegeListeners.isEmpty()){
+	private boolean fireSiegeListeners(EventStage stage)
+	{
+		if (!siegeListeners.isEmpty())
+		{
 			SiegeEvent event = new SiegeEvent();
 			event.setSiege(this);
 			event.setStage(stage);
-			switch(stage){
+			switch (stage)
+			{
 				case START:
 				{
-					for(SiegeListener listener : siegeListeners)
+					for (SiegeListener listener : siegeListeners)
 					{
-						if(!listener.onStart(event))
+						if (!listener.onStart(event))
 						{
 							return false;
 						}
@@ -1701,7 +1706,7 @@ public class Siege implements Siegable
 				}
 				case END:
 				{
-					for(SiegeListener listener : siegeListeners)
+					for (SiegeListener listener : siegeListeners)
 					{
 						listener.onEnd(event);
 					}
@@ -1709,7 +1714,7 @@ public class Siege implements Siegable
 				}
 				case CONTROL_CHANGE:
 				{
-					for(SiegeListener listener : siegeListeners)
+					for (SiegeListener listener : siegeListeners)
 					{
 						listener.onControlChange(event);
 					}
@@ -1726,7 +1731,7 @@ public class Siege implements Siegable
 	 */
 	public static void addSiegeListener(SiegeListener listener)
 	{
-		if(!siegeListeners.contains(listener))
+		if (!siegeListeners.contains(listener))
 		{
 			siegeListeners.add(listener);
 		}

+ 14 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/TvTEvent.java

@@ -1215,13 +1215,15 @@ public class TvTEvent
 	 * @param victim
 	 * @param killerTeam
 	 */
-	private static void fireTvtKillListeners(L2PcInstance killer, L2PcInstance victim, TvTEventTeam killerTeam){
-		if(!tvtListeners.isEmpty() && killer != null && victim != null && killerTeam != null){
+	private static void fireTvtKillListeners(L2PcInstance killer, L2PcInstance victim, TvTEventTeam killerTeam)
+	{
+		if (!tvtListeners.isEmpty() && killer != null && victim != null && killerTeam != null)
+		{
 			TvtKillEvent event = new TvtKillEvent();
 			event.setKiller(killer);
 			event.setVictim(victim);
 			event.setKillerTeam(killerTeam);
-			for(TvTListener listener : tvtListeners)
+			for (TvTListener listener : tvtListeners)
 			{
 				listener.onKill(event);
 			}
@@ -1232,12 +1234,15 @@ public class TvTEvent
 	 * Fires the appropriate TvtEventListeners, if any
 	 * @param stage
 	 */
-	private static void fireTvtEventListeners(EventStage stage){
-		if(!tvtListeners.isEmpty()){
-			switch(stage){
+	private static void fireTvtEventListeners(EventStage stage)
+	{
+		if (!tvtListeners.isEmpty())
+		{
+			switch (stage)
+			{
 				case REGISTRATION_BEGIN:
 				{
-					for(TvTListener listener : tvtListeners)
+					for (TvTListener listener : tvtListeners)
 					{
 						listener.onRegistrationStart();
 					}
@@ -1245,7 +1250,7 @@ public class TvTEvent
 				}
 				case START:
 				{
-					for(TvTListener listener : tvtListeners)
+					for (TvTListener listener : tvtListeners)
 					{
 						listener.onBegin();
 					}
@@ -1253,7 +1258,7 @@ public class TvTEvent
 				}
 				case END:
 				{
-					for(TvTListener listener : tvtListeners)
+					for (TvTListener listener : tvtListeners)
 					{
 						listener.onEnd();
 					}

+ 33 - 20
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java

@@ -85,7 +85,7 @@ public final class ClanWarehouse extends Warehouse
 	public L2ItemInstance addItem(String process, int itemId, long count, L2PcInstance actor, Object reference)
 	{
 		L2ItemInstance item = getItemByItemId(itemId);
-		if(!fireClanWarehouseAddItemListeners(process,item,actor,count))
+		if (!fireClanWarehouseAddItemListeners(process, item, actor, count))
 		{
 			return null;
 		}
@@ -95,7 +95,7 @@ public final class ClanWarehouse extends Warehouse
 	@Override
 	public L2ItemInstance addItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference)
 	{
-		if(!fireClanWarehouseAddItemListeners(process,item,actor,item.getCount()))
+		if (!fireClanWarehouseAddItemListeners(process, item, actor, item.getCount()))
 		{
 			return null;
 		}
@@ -105,7 +105,8 @@ public final class ClanWarehouse extends Warehouse
 	@Override
 	public L2ItemInstance destroyItem(String process, L2ItemInstance item, long count, L2PcInstance actor, Object reference)
 	{
-		if(!fireClanWarehouseDeleteItemListeners(process,item,actor,count)){
+		if (!fireClanWarehouseDeleteItemListeners(process, item, actor, count))
+		{
 			return null;
 		}
 		return super.destroyItem(process, item, count, actor, reference);
@@ -115,7 +116,7 @@ public final class ClanWarehouse extends Warehouse
 	public L2ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, L2PcInstance actor, Object reference)
 	{
 		L2ItemInstance sourceitem = getItemByObjectId(objectId);
-		if(!fireClanWarehouseTransferListeners(process,sourceitem,count,target,actor))
+		if (!fireClanWarehouseTransferListeners(process, sourceitem, count, target, actor))
 		{
 			return null;
 		}
@@ -129,18 +130,22 @@ public final class ClanWarehouse extends Warehouse
 	 * @param process
 	 * @param item
 	 * @param actor
-	 * @param count 
+	 * @param count
 	 * @return
 	 */
-	private boolean fireClanWarehouseAddItemListeners(String process, L2ItemInstance item, L2PcInstance actor, long count){
-		if(!clanWarehouseListeners.isEmpty() && actor != null && item != null){
+	private boolean fireClanWarehouseAddItemListeners(String process, L2ItemInstance item, L2PcInstance actor, long count)
+	{
+		if (!clanWarehouseListeners.isEmpty() && actor != null && item != null)
+		{
 			ClanWarehouseAddItemEvent event = new ClanWarehouseAddItemEvent();
 			event.setActor(actor);
 			event.setItem(item);
 			event.setCount(count);
 			event.setProcess(process);
-			for(ClanWarehouseListener listener : clanWarehouseListeners){
-				if(!listener.onAddItem(event)){
+			for (ClanWarehouseListener listener : clanWarehouseListeners)
+			{
+				if (!listener.onAddItem(event))
+				{
 					return false;
 				}
 			}
@@ -154,18 +159,22 @@ public final class ClanWarehouse extends Warehouse
 	 * @param process
 	 * @param item
 	 * @param actor
-	 * @param count 
+	 * @param count
 	 * @return
 	 */
-	private boolean fireClanWarehouseDeleteItemListeners(String process, L2ItemInstance item, L2PcInstance actor, long count){
-		if(!clanWarehouseListeners.isEmpty() && actor != null && item != null){
+	private boolean fireClanWarehouseDeleteItemListeners(String process, L2ItemInstance item, L2PcInstance actor, long count)
+	{
+		if (!clanWarehouseListeners.isEmpty() && actor != null && item != null)
+		{
 			ClanWarehouseDeleteItemEvent event = new ClanWarehouseDeleteItemEvent();
 			event.setActor(actor);
 			event.setCount(count);
 			event.setItem(item);
 			event.setProcess(process);
-			for(ClanWarehouseListener listener : clanWarehouseListeners){
-				if(!listener.onDeleteItem(event)){
+			for (ClanWarehouseListener listener : clanWarehouseListeners)
+			{
+				if (!listener.onDeleteItem(event))
+				{
 					return false;
 				}
 			}
@@ -178,21 +187,25 @@ public final class ClanWarehouse extends Warehouse
 	 * Action is cancelled if it returns false
 	 * @param process
 	 * @param item
-	 * @param count 
-	 * @param target 
+	 * @param count
+	 * @param target
 	 * @param actor
 	 * @return
 	 */
-	private boolean fireClanWarehouseTransferListeners(String process, L2ItemInstance item, long count, ItemContainer target, L2PcInstance actor){
-		if(!clanWarehouseListeners.isEmpty() && actor != null && item != null && target != null){
+	private boolean fireClanWarehouseTransferListeners(String process, L2ItemInstance item, long count, ItemContainer target, L2PcInstance actor)
+	{
+		if (!clanWarehouseListeners.isEmpty() && actor != null && item != null && target != null)
+		{
 			ClanWarehouseTransferEvent event = new ClanWarehouseTransferEvent();
 			event.setActor(actor);
 			event.setCount(count);
 			event.setItem(item);
 			event.setProcess(process);
 			event.setTarget(target);
-			for(ClanWarehouseListener listener : clanWarehouseListeners){
-				if(!listener.onTransferItem(event)){
+			for (ClanWarehouseListener listener : clanWarehouseListeners)
+			{
+				if (!listener.onTransferItem(event))
+				{
 					return false;
 				}
 			}

+ 10 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -965,7 +965,8 @@ public class PcInventory extends Inventory
 	}
 	
 	// LISTENERS
-	private static enum TrackerEvent{
+	private static enum TrackerEvent
+	{
 		DROP,
 		ADD_TO_INVENTORY,
 		DESTROY,
@@ -979,9 +980,12 @@ public class PcInventory extends Inventory
 	 * @param item
 	 * @param target
 	 */
-	private void fireTrackerEvents(TrackerEvent tEvent, L2PcInstance actor, L2ItemInstance item, ItemContainer target){
-		if(item != null && actor != null && !itemTrackers.isEmpty()){
-			switch(tEvent){
+	private void fireTrackerEvents(TrackerEvent tEvent, L2PcInstance actor, L2ItemInstance item, ItemContainer target)
+	{
+		if (item != null && actor != null && !itemTrackers.isEmpty())
+		{
+			switch (tEvent)
+			{
 				case ADD_TO_INVENTORY:
 				{
 					AddToInventoryEvent event = new AddToInventoryEvent();
@@ -1029,7 +1033,8 @@ public class PcInventory extends Inventory
 				}
 				case TRANSFER:
 				{
-					if(target != null){
+					if (target != null)
+					{
 						ItemTransferEvent event = new ItemTransferEvent();
 						event.setItem(item);
 						event.setPlayer(actor);

+ 27 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -251,7 +251,8 @@ public final class L2ItemInstance extends L2Object
 	 */
 	public final void pickupMe(L2Character player)
 	{
-		if(!firePickupListeners(player.getActingPlayer())){
+		if (!firePickupListeners(player.getActingPlayer()))
+		{
 			return;
 		}
 		assert getPosition().getWorldRegion() != null;
@@ -891,7 +892,8 @@ public final class L2ItemInstance extends L2Object
 		// there shall be no previous augmentation..
 		if (_augmentation != null)
 			return false;
-		if(!fireAugmentListeners(true,augmentation)){
+		if (!fireAugmentListeners(true, augmentation))
+		{
 			return false;
 		}
 		_augmentation = augmentation;
@@ -906,7 +908,8 @@ public final class L2ItemInstance extends L2Object
 	{
 		if (_augmentation == null)
 			return;
-		if(!fireAugmentListeners(true,_augmentation)){
+		if (!fireAugmentListeners(true, _augmentation))
+		{
 			return;
 		}
 		_augmentation = null;
@@ -1619,7 +1622,8 @@ public final class L2ItemInstance extends L2Object
 	
 	public final void dropMe(L2Character dropper, int x, int y, int z)
 	{
-		if(!fireDropListeners(dropper.getActingPlayer(),x,y,z)){
+		if (!fireDropListeners(dropper.getActingPlayer(), x, y, z))
+		{
 			return;
 		}
 		ThreadPoolManager.getInstance().executeTask(new ItemDropTask(this, dropper, x, y, z));
@@ -2067,8 +2071,10 @@ public final class L2ItemInstance extends L2Object
 	 * @param actor
 	 * @return false if the item cannot be picked up by the given player
 	 */
-	private boolean firePickupListeners(L2PcInstance actor){
-		if(!dropListeners.isEmpty() && actor != null){
+	private boolean firePickupListeners(L2PcInstance actor)
+	{
+		if (!dropListeners.isEmpty() && actor != null)
+		{
 			ItemPickupEvent event = new ItemPickupEvent();
 			event.setItem(this);
 			event.setPicker(actor);
@@ -2087,23 +2093,28 @@ public final class L2ItemInstance extends L2Object
 	/**
 	 * Fires all the AugmentListener.onAugment() methods, if any
 	 * @param isAugment
-	 * @param augmentation 
+	 * @param augmentation
 	 * @return false if the operation is not allowed
 	 */
-	private boolean fireAugmentListeners(boolean isAugment, L2Augmentation augmentation){
-		if(!augmentListeners.isEmpty() && augmentation != null){
+	private boolean fireAugmentListeners(boolean isAugment, L2Augmentation augmentation)
+	{
+		if (!augmentListeners.isEmpty() && augmentation != null)
+		{
 			AugmentEvent event = new AugmentEvent();
 			event.setAugmentation(augmentation);
 			event.setIsAugment(isAugment);
 			event.setItem(this);
 			for (AugmentListener listener : augmentListeners)
 			{
-				if(isAugment){
+				if (isAugment)
+				{
 					if (!listener.onAugment(event))
 						return false;
 				}
-				else{
-					if(!listener.onRemoveAugment(event)){
+				else
+				{
+					if (!listener.onRemoveAugment(event))
+					{
 						return false;
 					}
 				}
@@ -2112,8 +2123,10 @@ public final class L2ItemInstance extends L2Object
 		return true;
 	}
 	
-	private boolean fireDropListeners(L2PcInstance dropper, int x, int y, int z){
-		if(!dropListeners.isEmpty() && dropper != null && dropper.isPlayer()){
+	private boolean fireDropListeners(L2PcInstance dropper, int x, int y, int z)
+	{
+		if (!dropListeners.isEmpty() && dropper != null && dropper.isPlayer())
+		{
 			ItemDropEvent event = new ItemDropEvent();
 			event.setDropper(dropper);
 			event.setItem(this);

+ 2 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java

@@ -108,7 +108,8 @@ public final class RequestRestart extends L2GameClientPacket
 				player.getParty().broadcastToPartyMembers(SystemMessage.sendString(player.getName() + " has been removed from the upcoming festival."));
 		}
 
-		for(PlayerDespawnListener listener : despawnListeners){
+		for (PlayerDespawnListener listener : despawnListeners)
+		{
 			listener.onDespawn(player);
 		}
 

+ 9 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Say2.java

@@ -325,8 +325,10 @@ public final class Say2 extends L2GameClientPacket
 	 * Fires all the chat listeners, if any
 	 * @param activeChar
 	 */
-	private void fireChatListeners(L2PcInstance activeChar){
-		if(!chatListeners.isEmpty()){
+	private void fireChatListeners(L2PcInstance activeChar)
+	{
+		if (!chatListeners.isEmpty())
+		{
 			ChatEvent event = null;
 			event = new ChatEvent();
 			event.setOrigin(activeChar);
@@ -347,8 +349,10 @@ public final class Say2 extends L2GameClientPacket
 	 * other!
 	 * @param activeChar
 	 */
-	private void fireChatFilters(L2PcInstance activeChar){
-		if(!chatFilterListeners.isEmpty()){
+	private void fireChatFilters(L2PcInstance activeChar)
+	{
+		if (!chatFilterListeners.isEmpty())
+		{
 			ChatEvent event = null;
 			event = new ChatEvent();
 			event.setOrigin(activeChar);
@@ -362,7 +366,7 @@ public final class Say2 extends L2GameClientPacket
 		}
 		
 	}
-	
+
 	/**
 	 * Adds a chat listener
 	 * @param listener

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/AddToInventoryEvent.java

@@ -20,12 +20,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class AddToInventoryEvent implements L2Event
 {
 	private L2ItemInstance item;
 	private L2PcInstance player;
+	
 	/**
 	 * @return the item
 	 */
@@ -33,6 +33,7 @@ public class AddToInventoryEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -40,6 +41,7 @@ public class AddToInventoryEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the player
 	 */
@@ -47,6 +49,7 @@ public class AddToInventoryEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/AttackEvent.java

@@ -19,12 +19,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class AttackEvent implements L2Event
 {
 	private L2Character attacker;
 	private L2Character target;
+	
 	/**
 	 * @return the attacker
 	 */
@@ -32,6 +32,7 @@ public class AttackEvent implements L2Event
 	{
 		return attacker;
 	}
+	
 	/**
 	 * @param attacker the attacker to set
 	 */
@@ -39,6 +40,7 @@ public class AttackEvent implements L2Event
 	{
 		this.attacker = attacker;
 	}
+	
 	/**
 	 * @return the target
 	 */
@@ -46,6 +48,7 @@ public class AttackEvent implements L2Event
 	{
 		return target;
 	}
+	
 	/**
 	 * @param target the target to set
 	 */

+ 5 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/AugmentEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class AugmentEvent implements L2Event
 {
@@ -35,6 +34,7 @@ public class AugmentEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -42,6 +42,7 @@ public class AugmentEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the augmentation
 	 */
@@ -49,6 +50,7 @@ public class AugmentEvent implements L2Event
 	{
 		return augmentation;
 	}
+	
 	/**
 	 * @param augmentation the augmentation to set
 	 */
@@ -56,6 +58,7 @@ public class AugmentEvent implements L2Event
 	{
 		this.augmentation = augmentation;
 	}
+	
 	/**
 	 * @return the isAugment
 	 */
@@ -63,6 +66,7 @@ public class AugmentEvent implements L2Event
 	{
 		return isAugment;
 	}
+	
 	/**
 	 * @param isAugment the isAugment to set
 	 */

+ 8 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ChatEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.listeners.talk.ChatListen
 
 /**
  * @author TheOne
- *
  */
 public class ChatEvent implements L2Event
 {
@@ -28,6 +27,7 @@ public class ChatEvent implements L2Event
 	private L2PcInstance origin;
 	private String target;
 	private ChatTargetType targetType;
+	
 	/**
 	 * @return the text
 	 */
@@ -35,6 +35,7 @@ public class ChatEvent implements L2Event
 	{
 		return text;
 	}
+	
 	/**
 	 * @param text the text to set
 	 */
@@ -42,6 +43,7 @@ public class ChatEvent implements L2Event
 	{
 		this.text = text;
 	}
+	
 	/**
 	 * @return the origin
 	 */
@@ -49,6 +51,7 @@ public class ChatEvent implements L2Event
 	{
 		return origin;
 	}
+	
 	/**
 	 * @param origin the origin to set
 	 */
@@ -56,6 +59,7 @@ public class ChatEvent implements L2Event
 	{
 		this.origin = origin;
 	}
+	
 	/**
 	 * @return the target
 	 */
@@ -63,6 +67,7 @@ public class ChatEvent implements L2Event
 	{
 		return target;
 	}
+	
 	/**
 	 * @param target the target to set
 	 */
@@ -70,6 +75,7 @@ public class ChatEvent implements L2Event
 	{
 		this.target = target;
 	}
+	
 	/**
 	 * @return the targetType
 	 */
@@ -77,6 +83,7 @@ public class ChatEvent implements L2Event
 	{
 		return targetType;
 	}
+	
 	/**
 	 * @param targetType the targetType to set
 	 */

+ 2 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanCreationEvent.java

@@ -19,12 +19,11 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanCreationEvent implements L2Event
 {
 	private L2Clan clan;
-
+	
 	/**
 	 * @return the clan
 	 */
@@ -32,7 +31,7 @@ public class ClanCreationEvent implements L2Event
 	{
 		return clan;
 	}
-
+	
 	/**
 	 * @param clan the clan to set
 	 */

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanJoinEvent.java

@@ -20,12 +20,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanJoinEvent implements L2Event
 {
 	private L2PcInstance player;
 	private L2Clan clan;
+	
 	/**
 	 * @return the player
 	 */
@@ -33,6 +33,7 @@ public class ClanJoinEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -40,6 +41,7 @@ public class ClanJoinEvent implements L2Event
 	{
 		this.player = player;
 	}
+	
 	/**
 	 * @return the clan
 	 */
@@ -47,6 +49,7 @@ public class ClanJoinEvent implements L2Event
 	{
 		return clan;
 	}
+	
 	/**
 	 * @param clan the clan to set
 	 */

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanLeaderChangeEvent.java

@@ -20,13 +20,13 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanLeaderChangeEvent implements L2Event
 {
 	private L2Clan clan;
 	private L2PcInstance newLeader;
 	private L2PcInstance oldLeader;
+	
 	/**
 	 * @return the clan
 	 */
@@ -34,6 +34,7 @@ public class ClanLeaderChangeEvent implements L2Event
 	{
 		return clan;
 	}
+	
 	/**
 	 * @param clan the clan to set
 	 */
@@ -41,6 +42,7 @@ public class ClanLeaderChangeEvent implements L2Event
 	{
 		this.clan = clan;
 	}
+	
 	/**
 	 * @return the newLeader
 	 */
@@ -48,6 +50,7 @@ public class ClanLeaderChangeEvent implements L2Event
 	{
 		return newLeader;
 	}
+	
 	/**
 	 * @param newLeader the newLeader to set
 	 */
@@ -55,6 +58,7 @@ public class ClanLeaderChangeEvent implements L2Event
 	{
 		this.newLeader = newLeader;
 	}
+	
 	/**
 	 * @return the oldLeader
 	 */
@@ -62,6 +66,7 @@ public class ClanLeaderChangeEvent implements L2Event
 	{
 		return oldLeader;
 	}
+	
 	/**
 	 * @param oldLeader the oldLeader to set
 	 */

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanLeaveEvent.java

@@ -19,12 +19,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanLeaveEvent implements L2Event
 {
 	private int playerId;
 	private L2Clan clan;
+	
 	/**
 	 * @return the playerId
 	 */
@@ -32,6 +32,7 @@ public class ClanLeaveEvent implements L2Event
 	{
 		return playerId;
 	}
+	
 	/**
 	 * @param playerId the playerId to set
 	 */
@@ -39,6 +40,7 @@ public class ClanLeaveEvent implements L2Event
 	{
 		this.playerId = playerId;
 	}
+	
 	/**
 	 * @return the clan
 	 */
@@ -46,6 +48,7 @@ public class ClanLeaveEvent implements L2Event
 	{
 		return clan;
 	}
+	
 	/**
 	 * @param clan the clan to set
 	 */

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanLevelUpEvent.java

@@ -19,12 +19,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanLevelUpEvent implements L2Event
 {
 	private L2Clan clan;
 	private int oldLevel;
+	
 	/**
 	 * @return the clan
 	 */
@@ -32,6 +32,7 @@ public class ClanLevelUpEvent implements L2Event
 	{
 		return clan;
 	}
+	
 	/**
 	 * @param clan the clan to set
 	 */
@@ -39,6 +40,7 @@ public class ClanLevelUpEvent implements L2Event
 	{
 		this.clan = clan;
 	}
+	
 	/**
 	 * @return the oldLevel
 	 */
@@ -46,6 +48,7 @@ public class ClanLevelUpEvent implements L2Event
 	{
 		return oldLevel;
 	}
+	
 	/**
 	 * @param oldLevel the oldLevel to set
 	 */

+ 5 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.impl.L2Script.EventStage;
 
 /**
  * @author TheOne
- *
  */
 public class ClanWarEvent implements L2Event
 {
@@ -35,6 +34,7 @@ public class ClanWarEvent implements L2Event
 	{
 		return clan1;
 	}
+	
 	/**
 	 * @param clan1 the clan1 to set
 	 */
@@ -42,6 +42,7 @@ public class ClanWarEvent implements L2Event
 	{
 		this.clan1 = clan1;
 	}
+	
 	/**
 	 * @return the clan2
 	 */
@@ -49,6 +50,7 @@ public class ClanWarEvent implements L2Event
 	{
 		return clan2;
 	}
+	
 	/**
 	 * @param clan2 the clan2 to set
 	 */
@@ -56,6 +58,7 @@ public class ClanWarEvent implements L2Event
 	{
 		this.clan2 = clan2;
 	}
+	
 	/**
 	 * @return the stage
 	 */
@@ -63,6 +66,7 @@ public class ClanWarEvent implements L2Event
 	{
 		return stage;
 	}
+	
 	/**
 	 * @param stage the stage to set
 	 */

+ 8 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarehouseAddItemEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanWarehouseAddItemEvent implements L2Event
 {
@@ -36,6 +35,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		return process;
 	}
+	
 	/**
 	 * @param process the process to set
 	 */
@@ -43,6 +43,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		this.process = process;
 	}
+	
 	/**
 	 * @return the item
 	 */
@@ -50,6 +51,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -57,6 +59,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the actor
 	 */
@@ -64,6 +67,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		return actor;
 	}
+	
 	/**
 	 * @param actor the actor to set
 	 */
@@ -71,6 +75,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		this.actor = actor;
 	}
+	
 	/**
 	 * @return the count
 	 */
@@ -78,6 +83,7 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		return count;
 	}
+	
 	/**
 	 * @param count the count to set
 	 */
@@ -85,5 +91,5 @@ public class ClanWarehouseAddItemEvent implements L2Event
 	{
 		this.count = count;
 	}
-
+	
 }

+ 9 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarehouseDeleteItemEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanWarehouseDeleteItemEvent implements L2Event
 {
@@ -28,6 +27,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	private L2ItemInstance item;
 	private L2PcInstance actor;
 	private long count;
+	
 	/**
 	 * @return the process
 	 */
@@ -35,6 +35,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		return process;
 	}
+	
 	/**
 	 * @param process the process to set
 	 */
@@ -42,6 +43,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		this.process = process;
 	}
+	
 	/**
 	 * @return the item
 	 */
@@ -49,6 +51,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -56,6 +59,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the actor
 	 */
@@ -63,6 +67,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		return actor;
 	}
+	
 	/**
 	 * @param actor the actor to set
 	 */
@@ -70,6 +75,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		this.actor = actor;
 	}
+	
 	/**
 	 * @return the count
 	 */
@@ -77,6 +83,7 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		return count;
 	}
+	
 	/**
 	 * @param count the count to set
 	 */
@@ -84,5 +91,5 @@ public class ClanWarehouseDeleteItemEvent implements L2Event
 	{
 		this.count = count;
 	}
-
+	
 }

+ 10 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ClanWarehouseTransferEvent.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ClanWarehouseTransferEvent implements L2Event
 {
@@ -30,6 +29,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	private L2PcInstance actor;
 	private long count;
 	private ItemContainer target;
+	
 	/**
 	 * @return the process
 	 */
@@ -37,6 +37,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		return process;
 	}
+	
 	/**
 	 * @param process the process to set
 	 */
@@ -44,6 +45,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		this.process = process;
 	}
+	
 	/**
 	 * @return the item
 	 */
@@ -51,6 +53,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -58,6 +61,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the actor
 	 */
@@ -65,6 +69,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		return actor;
 	}
+	
 	/**
 	 * @param actor the actor to set
 	 */
@@ -72,6 +77,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		this.actor = actor;
 	}
+	
 	/**
 	 * @return the count
 	 */
@@ -79,6 +85,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		return count;
 	}
+	
 	/**
 	 * @param count the count to set
 	 */
@@ -86,6 +93,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		this.count = count;
 	}
+	
 	/**
 	 * @return the target
 	 */
@@ -93,6 +101,7 @@ public class ClanWarehouseTransferEvent implements L2Event
 	{
 		return target;
 	}
+	
 	/**
 	 * @param target the target to set
 	 */

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/DeathEvent.java

@@ -19,12 +19,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class DeathEvent implements L2Event
 {
 	private L2Character victim;
 	private L2Character killer;
+	
 	/**
 	 * @return the victim
 	 */
@@ -32,6 +32,7 @@ public class DeathEvent implements L2Event
 	{
 		return victim;
 	}
+	
 	/**
 	 * @param victim the victim to set
 	 */
@@ -39,6 +40,7 @@ public class DeathEvent implements L2Event
 	{
 		this.victim = victim;
 	}
+	
 	/**
 	 * @return the killer
 	 */
@@ -46,6 +48,7 @@ public class DeathEvent implements L2Event
 	{
 		return killer;
 	}
+	
 	/**
 	 * @param killer the killer to set
 	 */

+ 4 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/EquipmentEvent.java

@@ -19,12 +19,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class EquipmentEvent implements L2Event
 {
 	private L2ItemInstance item;
 	private boolean isEquipped;
+	
 	/**
 	 * @return the item
 	 */
@@ -32,6 +32,7 @@ public class EquipmentEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -39,6 +40,7 @@ public class EquipmentEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the isEquipped
 	 */
@@ -46,6 +48,7 @@ public class EquipmentEvent implements L2Event
 	{
 		return isEquipped;
 	}
+	
 	/**
 	 * @param isEquipped the isEquipped to set
 	 */

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/FortSiegeEvent.java

@@ -20,13 +20,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.impl.L2Script.EventStage;
 
 /**
  * @author TheOne
- *
  */
 public class FortSiegeEvent implements L2Event
 {
 	private FortSiege siege;
 	private EventStage stage;
-
+	
 	/**
 	 * @return the siege
 	 */
@@ -34,7 +33,7 @@ public class FortSiegeEvent implements L2Event
 	{
 		return siege;
 	}
-
+	
 	/**
 	 * @param siege the siege to set
 	 */
@@ -42,7 +41,7 @@ public class FortSiegeEvent implements L2Event
 	{
 		this.siege = siege;
 	}
-
+	
 	/**
 	 * @return the stage
 	 */
@@ -50,7 +49,7 @@ public class FortSiegeEvent implements L2Event
 	{
 		return stage;
 	}
-
+	
 	/**
 	 * @param stage the stage to set
 	 */

+ 5 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/HennaEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class HennaEvent implements L2Event
 {
@@ -35,6 +34,7 @@ public class HennaEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -42,6 +42,7 @@ public class HennaEvent implements L2Event
 	{
 		this.player = player;
 	}
+	
 	/**
 	 * @return the henna
 	 */
@@ -49,6 +50,7 @@ public class HennaEvent implements L2Event
 	{
 		return henna;
 	}
+	
 	/**
 	 * @param henna the henna to set
 	 */
@@ -56,6 +58,7 @@ public class HennaEvent implements L2Event
 	{
 		this.henna = henna;
 	}
+	
 	/**
 	 * @return the add
 	 */
@@ -63,6 +66,7 @@ public class HennaEvent implements L2Event
 	{
 		return add;
 	}
+	
 	/**
 	 * @param add the add to set
 	 */

+ 10 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemCreateEvent.java

@@ -19,7 +19,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ItemCreateEvent implements L2Event
 {
@@ -28,6 +27,7 @@ public class ItemCreateEvent implements L2Event
 	private String process;
 	private Object reference;
 	private long count;
+	
 	/**
 	 * @return the player
 	 */
@@ -35,6 +35,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -42,6 +43,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		this.player = player;
 	}
+	
 	/**
 	 * @return the itemId
 	 */
@@ -49,6 +51,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		return itemId;
 	}
+	
 	/**
 	 * @param itemId the itemId to set
 	 */
@@ -56,6 +59,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		this.itemId = itemId;
 	}
+	
 	/**
 	 * @return the process
 	 */
@@ -63,6 +67,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		return process;
 	}
+	
 	/**
 	 * @param process the process to set
 	 */
@@ -70,6 +75,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		this.process = process;
 	}
+	
 	/**
 	 * @return the reference
 	 */
@@ -77,6 +83,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		return reference;
 	}
+	
 	/**
 	 * @param reference the reference to set
 	 */
@@ -84,6 +91,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		this.reference = reference;
 	}
+	
 	/**
 	 * @return the count
 	 */
@@ -91,6 +99,7 @@ public class ItemCreateEvent implements L2Event
 	{
 		return count;
 	}
+	
 	/**
 	 * @param count the count to set
 	 */

+ 3 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemDestroyEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ItemDestroyEvent implements L2Event
 {
@@ -34,6 +33,7 @@ public class ItemDestroyEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -41,6 +41,7 @@ public class ItemDestroyEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the player
 	 */
@@ -48,6 +49,7 @@ public class ItemDestroyEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -55,6 +57,5 @@ public class ItemDestroyEvent implements L2Event
 	{
 		this.player = player;
 	}
-
 	
 }

+ 9 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemDropEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ItemDropEvent implements L2Event
 {
@@ -37,6 +36,7 @@ public class ItemDropEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -44,6 +44,7 @@ public class ItemDropEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the dropper
 	 */
@@ -51,6 +52,7 @@ public class ItemDropEvent implements L2Event
 	{
 		return dropper;
 	}
+	
 	/**
 	 * @param dropper the dropper to set
 	 */
@@ -58,6 +60,7 @@ public class ItemDropEvent implements L2Event
 	{
 		this.dropper = dropper;
 	}
+	
 	/**
 	 * @return the x
 	 */
@@ -65,6 +68,7 @@ public class ItemDropEvent implements L2Event
 	{
 		return x;
 	}
+	
 	/**
 	 * @param x the x to set
 	 */
@@ -72,6 +76,7 @@ public class ItemDropEvent implements L2Event
 	{
 		this.x = x;
 	}
+	
 	/**
 	 * @return the y
 	 */
@@ -79,6 +84,7 @@ public class ItemDropEvent implements L2Event
 	{
 		return y;
 	}
+	
 	/**
 	 * @param y the y to set
 	 */
@@ -86,6 +92,7 @@ public class ItemDropEvent implements L2Event
 	{
 		this.y = y;
 	}
+	
 	/**
 	 * @return the z
 	 */
@@ -93,6 +100,7 @@ public class ItemDropEvent implements L2Event
 	{
 		return z;
 	}
+	
 	/**
 	 * @param z the z to set
 	 */

+ 10 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemPickupEvent.java

@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ItemPickupEvent implements L2Event
 {
@@ -29,6 +28,7 @@ public class ItemPickupEvent implements L2Event
 	private int x;
 	private int y;
 	private int z;
+	
 	/**
 	 * @return the item
 	 */
@@ -36,6 +36,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -43,6 +44,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the picker
 	 */
@@ -50,6 +52,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		return picker;
 	}
+	
 	/**
 	 * @param picker the picker to set
 	 */
@@ -57,6 +60,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		this.picker = picker;
 	}
+	
 	/**
 	 * @return the x
 	 */
@@ -64,6 +68,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		return x;
 	}
+	
 	/**
 	 * @param x the x to set
 	 */
@@ -71,6 +76,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		this.x = x;
 	}
+	
 	/**
 	 * @return the y
 	 */
@@ -78,6 +84,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		return y;
 	}
+	
 	/**
 	 * @param y the y to set
 	 */
@@ -85,6 +92,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		this.y = y;
 	}
+	
 	/**
 	 * @return the z
 	 */
@@ -92,6 +100,7 @@ public class ItemPickupEvent implements L2Event
 	{
 		return z;
 	}
+	
 	/**
 	 * @param z the z to set
 	 */

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemTransferEvent.java

@@ -21,13 +21,13 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ItemTransferEvent implements L2Event
 {
 	private L2ItemInstance item;
 	private L2PcInstance player;
 	private ItemContainer target;
+	
 	/**
 	 * @return the item
 	 */
@@ -35,6 +35,7 @@ public class ItemTransferEvent implements L2Event
 	{
 		return item;
 	}
+	
 	/**
 	 * @param item the item to set
 	 */
@@ -42,6 +43,7 @@ public class ItemTransferEvent implements L2Event
 	{
 		this.item = item;
 	}
+	
 	/**
 	 * @return the player
 	 */
@@ -49,6 +51,7 @@ public class ItemTransferEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -56,6 +59,7 @@ public class ItemTransferEvent implements L2Event
 	{
 		this.player = player;
 	}
+	
 	/**
 	 * @return the target
 	 */
@@ -63,6 +67,7 @@ public class ItemTransferEvent implements L2Event
 	{
 		return target;
 	}
+	
 	/**
 	 * @param target the target to set
 	 */

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/PlayerLevelChangeEvent.java

@@ -19,13 +19,13 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class PlayerLevelChangeEvent implements L2Event
 {
 	private L2PcInstance player;
 	private int oldLevel;
 	private int newLevel;
+	
 	/**
 	 * @return the player
 	 */
@@ -33,6 +33,7 @@ public class PlayerLevelChangeEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -40,6 +41,7 @@ public class PlayerLevelChangeEvent implements L2Event
 	{
 		this.player = player;
 	}
+	
 	/**
 	 * @return the oldLevel
 	 */
@@ -47,6 +49,7 @@ public class PlayerLevelChangeEvent implements L2Event
 	{
 		return oldLevel;
 	}
+	
 	/**
 	 * @param oldLevel the oldLevel to set
 	 */
@@ -54,6 +57,7 @@ public class PlayerLevelChangeEvent implements L2Event
 	{
 		this.oldLevel = oldLevel;
 	}
+	
 	/**
 	 * @return the newLevel
 	 */
@@ -61,6 +65,7 @@ public class PlayerLevelChangeEvent implements L2Event
 	{
 		return newLevel;
 	}
+	
 	/**
 	 * @param newLevel the newLevel to set
 	 */

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ProfessionChangeEvent.java

@@ -20,13 +20,13 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class ProfessionChangeEvent implements L2Event
 {
 	private L2PcInstance player;
 	private boolean isSubClass;
 	private L2PcTemplate template;
+	
 	/**
 	 * @return the player
 	 */
@@ -34,6 +34,7 @@ public class ProfessionChangeEvent implements L2Event
 	{
 		return player;
 	}
+	
 	/**
 	 * @param player the player to set
 	 */
@@ -41,6 +42,7 @@ public class ProfessionChangeEvent implements L2Event
 	{
 		this.player = player;
 	}
+	
 	/**
 	 * @return the isSubClass
 	 */
@@ -48,6 +50,7 @@ public class ProfessionChangeEvent implements L2Event
 	{
 		return isSubClass;
 	}
+	
 	/**
 	 * @param isSubClass the isSubClass to set
 	 */
@@ -55,6 +58,7 @@ public class ProfessionChangeEvent implements L2Event
 	{
 		this.isSubClass = isSubClass;
 	}
+	
 	/**
 	 * @return the template
 	 */
@@ -62,6 +66,7 @@ public class ProfessionChangeEvent implements L2Event
 	{
 		return template;
 	}
+	
 	/**
 	 * @param template the template to set
 	 */

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/SiegeEvent.java

@@ -20,13 +20,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.impl.L2Script.EventStage;
 
 /**
  * @author TheOne
- *
  */
 public class SiegeEvent implements L2Event
 {
 	private Siege siege;
 	private EventStage stage;
-
+	
 	/**
 	 * @return the siege
 	 */
@@ -34,7 +33,7 @@ public class SiegeEvent implements L2Event
 	{
 		return siege;
 	}
-
+	
 	/**
 	 * @param siege the siege to set
 	 */
@@ -42,7 +41,7 @@ public class SiegeEvent implements L2Event
 	{
 		this.siege = siege;
 	}
-
+	
 	/**
 	 * @return the stage
 	 */
@@ -50,7 +49,7 @@ public class SiegeEvent implements L2Event
 	{
 		return stage;
 	}
-
+	
 	/**
 	 * @param stage the stage to set
 	 */

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/SkillUseEvent.java

@@ -21,13 +21,13 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class SkillUseEvent implements L2Event
 {
 	private L2Character caster;
 	private L2Skill skill;
 	private L2Object[] targets;
+	
 	/**
 	 * @return the caster
 	 */
@@ -35,6 +35,7 @@ public class SkillUseEvent implements L2Event
 	{
 		return caster;
 	}
+	
 	/**
 	 * @param caster the caster to set
 	 */
@@ -42,6 +43,7 @@ public class SkillUseEvent implements L2Event
 	{
 		this.caster = caster;
 	}
+	
 	/**
 	 * @return the targets
 	 */
@@ -49,6 +51,7 @@ public class SkillUseEvent implements L2Event
 	{
 		return targets;
 	}
+	
 	/**
 	 * @param targets the targets to set
 	 */
@@ -56,6 +59,7 @@ public class SkillUseEvent implements L2Event
 	{
 		this.targets = targets;
 	}
+	
 	/**
 	 * @return the skill
 	 */
@@ -63,6 +67,7 @@ public class SkillUseEvent implements L2Event
 	{
 		return skill;
 	}
+	
 	/**
 	 * @param skill the skill to set
 	 */

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/TransformEvent.java

@@ -19,13 +19,12 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class TransformEvent implements L2Event
 {
 	private L2Transformation transformation;
 	private boolean transforming; // false = untransforming
-
+	
 	/**
 	 * @return the transformation
 	 */
@@ -33,7 +32,7 @@ public class TransformEvent implements L2Event
 	{
 		return transformation;
 	}
-
+	
 	/**
 	 * @param transformation the transformation to set
 	 */
@@ -41,7 +40,7 @@ public class TransformEvent implements L2Event
 	{
 		this.transformation = transformation;
 	}
-
+	
 	/**
 	 * @return the transforming
 	 */
@@ -49,7 +48,7 @@ public class TransformEvent implements L2Event
 	{
 		return transforming;
 	}
-
+	
 	/**
 	 * @param transforming the transforming to set
 	 */

+ 6 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/TvtKillEvent.java

@@ -20,13 +20,13 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
 /**
  * @author TheOne
- *
  */
 public class TvtKillEvent implements L2Event
 {
 	private L2PcInstance killer;
 	private L2PcInstance victim;
 	private TvTEventTeam killerTeam;
+	
 	/**
 	 * @return the killer
 	 */
@@ -34,6 +34,7 @@ public class TvtKillEvent implements L2Event
 	{
 		return killer;
 	}
+	
 	/**
 	 * @param killer the killer to set
 	 */
@@ -41,6 +42,7 @@ public class TvtKillEvent implements L2Event
 	{
 		this.killer = killer;
 	}
+	
 	/**
 	 * @return the victim
 	 */
@@ -48,6 +50,7 @@ public class TvtKillEvent implements L2Event
 	{
 		return victim;
 	}
+	
 	/**
 	 * @param victim the victim to set
 	 */
@@ -55,6 +58,7 @@ public class TvtKillEvent implements L2Event
 	{
 		this.victim = victim;
 	}
+	
 	/**
 	 * @return the killerTeam
 	 */
@@ -62,6 +66,7 @@ public class TvtKillEvent implements L2Event
 	{
 		return killerTeam;
 	}
+	
 	/**
 	 * @param killerTeam the killerTeam to set
 	 */