Refactored Filters

Signed-off-by: Rogiel <rogiel@rogiel.com>

src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java

@@ -16,14 +16,40 @@
  */
 package com.l2jserver.game.net.packet.server;
 
+import static com.l2jserver.game.ProtocolVersion.FREYA;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.BELT;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.CHEST;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.CLOAK;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_1;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_2;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_3;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_4;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_5;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.FEET;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.GLOVES;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.HAIR1;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.HAIR2;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.HEAD;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.LEFT_BRACELET;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.LEFT_EAR;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.LEFT_FINGER;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.LEFT_HAND;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.LEGS;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.NECK;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.RIGHT_BRACELET;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.RIGHT_EAR;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.RIGHT_FINGER;
+import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.RIGHT_HAND;
+
 import org.jboss.netty.buffer.ChannelBuffer;
 
-import com.l2jserver.game.ProtocolVersion;
 import com.l2jserver.game.net.Lineage2Connection;
 import com.l2jserver.game.net.Lineage2Session;
 import com.l2jserver.game.net.packet.AbstractServerPacket;
+import com.l2jserver.model.world.Item;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.actor.ActorExperience;
+import com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll;
 import com.l2jserver.util.BufferUtils;
 
 /**
@@ -127,35 +153,31 @@ public class CharacterSelectionListPacket extends AbstractServerPacket {
 			// buffer.writeInt(0x00); // unk 6
 			// buffer.writeInt(0x00); // unk 7
 
-			for (int id = 0; id < 25; id++) {
+			writePaperdollItemID(buffer, character, HAIR1);
-				buffer.writeInt(0x00); // paperdolls
+			writePaperdollItemID(buffer, character, RIGHT_EAR);
-			}
+			writePaperdollItemID(buffer, character, LEFT_EAR);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR));
+			writePaperdollItemID(buffer, character, NECK);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_REAR));
+			writePaperdollItemID(buffer, character, RIGHT_FINGER);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LEAR));
+			writePaperdollItemID(buffer, character, LEFT_FINGER);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_NECK));
+			writePaperdollItemID(buffer, character, HEAD);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RFINGER));
+			writePaperdollItemID(buffer, character, RIGHT_HAND);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LFINGER));
+			writePaperdollItemID(buffer, character, LEFT_HAND);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HEAD));
+			writePaperdollItemID(buffer, character, GLOVES);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RHAND));
+			writePaperdollItemID(buffer, character, CHEST);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LHAND));
+			writePaperdollItemID(buffer, character, LEGS);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES));
+			writePaperdollItemID(buffer, character, FEET);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_CHEST));
+			writePaperdollItemID(buffer, character, CLOAK);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LEGS));
+			writePaperdollItemID(buffer, character, RIGHT_HAND);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_FEET));
+			writePaperdollItemID(buffer, character, HAIR1);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_CLOAK));
+			writePaperdollItemID(buffer, character, HAIR2);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RHAND));
+			writePaperdollItemID(buffer, character, RIGHT_BRACELET);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR));
+			writePaperdollItemID(buffer, character, LEFT_BRACELET);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR2));
+			writePaperdollItemID(buffer, character, DECORATION_1);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RBRACELET));
+			writePaperdollItemID(buffer, character, DECORATION_2);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LBRACELET));
+			writePaperdollItemID(buffer, character, DECORATION_3);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO1));
+			writePaperdollItemID(buffer, character, DECORATION_4);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO2));
+			writePaperdollItemID(buffer, character, DECORATION_5);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO3));
+			writePaperdollItemID(buffer, character, BELT);
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO4));
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO5));
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO6));
-			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_BELT));
 
 			// hair style
 			// buffer.writeInt(character.getAppearance().getHairStyle().option);
@@ -183,7 +205,7 @@ public class CharacterSelectionListPacket extends AbstractServerPacket {
 			buffer.writeInt(0x00);
 
 			// Freya by Vistall:
-			if (conn.supports(ProtocolVersion.FREYA)) {
+			if (conn.supports(FREYA)) {
 				// npdid - 16024 Tame Tiny Baby Kookaburra
 				buffer.writeInt(16024); // A9E89C
 				buffer.writeInt(0); // level
@@ -194,4 +216,13 @@ public class CharacterSelectionListPacket extends AbstractServerPacket {
 			}
 		}
 	}
+
+	private void writePaperdollItemID(ChannelBuffer buffer,
+			L2Character character, InventoryPaperdoll paperdoll) {
+		final Item item = character.getInventory().getItem(paperdoll);
+		int id = 0;
+		if (item != null)
+			id = item.getTemplateID().getID();
+		buffer.writeInt(id);
+	}
 }

src/main/java/com/l2jserver/model/world/Item.java

@@ -18,6 +18,7 @@ package com.l2jserver.model.world;
 
 import com.l2jserver.model.id.object.CharacterID;
 import com.l2jserver.model.id.template.ItemTemplateID;
+import com.l2jserver.model.template.ItemTemplate;
 import com.l2jserver.model.world.capability.Dropable;
 import com.l2jserver.model.world.capability.Listenable;
 import com.l2jserver.model.world.capability.Playable;
@@ -50,7 +51,13 @@ import com.l2jserver.util.dimensional.Coordinate;
  */
 public class Item extends AbstractObject implements Playable, Spawnable,
 		Listenable<ItemListener, ItemEvent>, Dropable {
+	/**
+	 * The {@link ItemTemplate} ID
+	 */
 	private final ItemTemplateID templateID;
+	/**
+	 * The {@link L2Character} ID owner of this object
+	 */
 	private CharacterID ownerID;
 
 	/**
@@ -66,6 +73,9 @@ public class Item extends AbstractObject implements Playable, Spawnable,
 	 */
 	private Coordinate coordinate;
 
+	/**
+	 * Count of items
+	 */
 	private int count = 1;
 
 	public Item(ItemTemplateID templateID) {
@@ -75,6 +85,8 @@ public class Item extends AbstractObject implements Playable, Spawnable,
 	@Override
 	public void drop(Coordinate position) {
 		this.coordinate = position;
+		this.location = null;
+		this.paperdoll = null;
 	}
 
 	@Override
@@ -84,8 +96,7 @@ public class Item extends AbstractObject implements Playable, Spawnable,
 
 	@Override
 	public boolean isSpawned() {
-		// TODO Auto-generated method stub
+		return (location != null);
-		return false;
 	}
 
 	@Override
@@ -98,6 +109,21 @@ public class Item extends AbstractObject implements Playable, Spawnable,
 		this.coordinate = coord;
 	}
 
+	/**
+	 * @return the count
+	 */
+	public int getCount() {
+		return count;
+	}
+
+	/**
+	 * @param count
+	 *            the count to set
+	 */
+	public void setCount(int count) {
+		this.count = count;
+	}
+
 	/**
 	 * @return the location
 	 */

src/main/java/com/l2jserver/model/world/actor/ActorEvent.java

@@ -17,7 +17,7 @@
 package com.l2jserver.model.world.actor;
 
 import com.l2jserver.model.world.capability.Actor;
-import com.l2jserver.model.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldEvent;
 
 /**
  * Base event for {@link Actor} instances

src/main/java/com/l2jserver/model/world/actor/ActorListener.java

@@ -17,7 +17,7 @@
 package com.l2jserver.model.world.actor;
 
 import com.l2jserver.model.world.capability.Actor;
-import com.l2jserver.model.world.event.WorldListener;
+import com.l2jserver.service.game.world.event.WorldListener;
 
 /**
  * Base listener for {@link Actor} instances

src/main/java/com/l2jserver/model/world/capability/Listenable.java

@@ -17,8 +17,8 @@
 package com.l2jserver.model.world.capability;
 
 import com.l2jserver.model.world.AbstractObject;
-import com.l2jserver.model.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldEvent;
-import com.l2jserver.model.world.event.WorldListener;
+import com.l2jserver.service.game.world.event.WorldListener;
 
 /**
  * Defines an {@link AbstractObject} that can attach {@link WorldListener} that

src/main/java/com/l2jserver/model/world/character/CharacterInventory.java

@@ -50,6 +50,21 @@ public class CharacterInventory implements Iterable<Item> {
 		this.character = character;
 	}
 
+	/**
+	 * Get the item in the given <tt>paperdoll</tt> slot
+	 * 
+	 * @param paperdoll
+	 *            the paperdoll slot
+	 * @return the item in slot, null if emptys
+	 */
+	public Item getItem(InventoryPaperdoll paperdoll) {
+		for (final Item item : items) {
+			if (item.getPaperdoll() == paperdoll)
+				return item;
+		}
+		return null;
+	}
+
 	/**
 	 * This method will add new items to the inventory. This is normally called
 	 * from the DAO object.
@@ -74,7 +89,7 @@ public class CharacterInventory implements Iterable<Item> {
 	}
 
 	/**
-	 * Location of an item
+	 * Location of an item in the player's inventory
 	 * 
 	 * @author <a href="http://www.rogiel.com">Rogiel</a>
 	 */
@@ -99,7 +114,11 @@ public class CharacterInventory implements Iterable<Item> {
 	 * @author <a href="http://www.rogiel.com">Rogiel</a>
 	 */
 	public enum InventoryPaperdoll {
-		UNDERWEAR, HEAD, HAIR1, HAIR2, NECK, RIGHT_HAND, LEFT_HAND, RIGHT_EAR, LEFT_EAR, GLOVES, LEGS, LEFT_FEET, RIGHT_FEET, RIGHT_FINGER, LEFT_FINGER, LEFT_BRACELET, RIGHT_BRACELET, DECORATION_1, DECOREATION_2, DECORATION_3, DECORATION_4, DECORATION_5, DECORATION_6, CLOAK, BELT;
+		UNDERWEAR, HEAD, HAIR1, HAIR2, NECK, RIGHT_HAND, FEET, LEFT_HAND, RIGHT_EAR, LEFT_EAR, GLOVES,
+
+		LEGS, LEFT_FEET, RIGHT_FEET, RIGHT_FINGER, LEFT_FINGER, CHEST, LEFT_BRACELET, RIGHT_BRACELET,
+
+		DECORATION_1, DECORATION_2, DECORATION_3, DECORATION_4, DECORATION_5, DECORATION_6, CLOAK, BELT;
 	}
 
 	/**

src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * l2jserver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.model.world.character.event;
+
+import com.l2jserver.model.world.L2Character;
+import com.l2jserver.model.world.player.event.PlayerEvent;
+
+/**
+ * Base event for character
+ * 
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ */
+public interface CharacterEvent extends PlayerEvent {
+	/**
+	 * The character issue in this event
+	 * 
+	 * @return the character
+	 */
+	L2Character getCharacter();
+}

src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java

@@ -0,0 +1,40 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * l2jserver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.model.world.character.event;
+
+import com.l2jserver.model.world.player.event.PlayerEvent;
+import com.l2jserver.model.world.player.event.PlayerListener;
+import com.l2jserver.service.game.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldListener;
+
+/**
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ * 
+ */
+public abstract class CharacterListener extends PlayerListener {
+	@Override
+	protected boolean dispatch(PlayerEvent e) {
+		if (!(e instanceof CharacterEvent))
+			return false;
+		return dispatch((CharacterEvent) e);
+	}
+
+	/**
+	 * @see WorldListener#dispatch(WorldEvent)
+	 */
+	protected abstract boolean dispatch(CharacterEvent e);
+}

src/main/java/com/l2jserver/model/world/character/event/CharacterLoggedInEvent.java

@@ -0,0 +1,96 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * l2jserver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.model.world.character.event;
+
+import java.util.Date;
+
+import com.l2jserver.model.world.L2Character;
+import com.l2jserver.model.world.Player;
+import com.l2jserver.model.world.WorldObject;
+import com.l2jserver.model.world.capability.Actor;
+import com.l2jserver.model.world.capability.Listenable;
+
+/**
+ * Event triggered once a character logs-in.
+ * 
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ */
+public class CharacterLoggedInEvent implements CharacterEvent {
+	/**
+	 * The character that is logging in
+	 */
+	private final L2Character character;
+	/**
+	 * The time that this character has logged in
+	 */
+	private final Date date;
+
+	/**
+	 * Creates a new instance
+	 * 
+	 * @param character
+	 *            the character
+	 * @param date
+	 *            the login date
+	 */
+	public CharacterLoggedInEvent(L2Character character, Date date) {
+		this.character = character;
+		this.date = date;
+	}
+
+	/**
+	 * Creates a new instance. Login date is set to now.
+	 * 
+	 * @param character
+	 *            the character
+	 */
+	public CharacterLoggedInEvent(L2Character character) {
+		this(character, new Date());
+	}
+
+	/**
+	 * @return the date
+	 */
+	public Date getDate() {
+		return date;
+	}
+
+	@Override
+	public Player getPlayer() {
+		return character;
+	}
+
+	@Override
+	public Actor getActor() {
+		return character;
+	}
+
+	@Override
+	public WorldObject getObject() {
+		return character;
+	}
+
+	@Override
+	public L2Character getCharacter() {
+		return character;
+	}
+
+	@Override
+	public Listenable<?, ?>[] getDispatchableObjects() {
+		return new Listenable<?, ?>[] { character };
+	}
+}

src/main/java/com/l2jserver/model/world/clan/ClanEvent.java

@@ -17,7 +17,7 @@
 package com.l2jserver.model.world.clan;
 
 import com.l2jserver.model.world.Clan;
-import com.l2jserver.model.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldEvent;
 
 /**
  * Base event for {@link Clan} objects

src/main/java/com/l2jserver/model/world/clan/ClanListener.java

@@ -16,7 +16,7 @@
  */
 package com.l2jserver.model.world.clan;
 
-import com.l2jserver.model.world.event.WorldListener;
+import com.l2jserver.service.game.world.event.WorldListener;
 
 /**
  * Base listener for {@link ClanEvent}

src/main/java/com/l2jserver/model/world/event/SpawnEvent.java

@@ -17,6 +17,7 @@
 package com.l2jserver.model.world.event;
 
 import com.l2jserver.model.world.capability.Spawnable;
+import com.l2jserver.service.game.world.event.WorldEvent;
 import com.l2jserver.util.dimensional.Coordinate;
 
 /**

src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java

@@ -21,7 +21,7 @@ import com.l2jserver.model.world.Player;
 import com.l2jserver.model.world.WorldObject;
 import com.l2jserver.model.world.capability.Actor;
 import com.l2jserver.model.world.capability.Listenable;
-import com.l2jserver.model.world.player.PlayerEvent;
+import com.l2jserver.model.world.player.event.PlayerEvent;
 
 /**
  * Event dispatched once an {@link Item} has been dropped on the ground.

src/main/java/com/l2jserver/model/world/item/ItemEvent.java

@@ -17,7 +17,7 @@
 package com.l2jserver.model.world.item;
 
 import com.l2jserver.model.world.Item;
-import com.l2jserver.model.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldEvent;
 
 /**
  * Base event for items

src/main/java/com/l2jserver/model/world/item/ItemListener.java

@@ -16,7 +16,7 @@
  */
 package com.l2jserver.model.world.item;
 
-import com.l2jserver.model.world.event.WorldListener;
+import com.l2jserver.service.game.world.event.WorldListener;
 
 /**
  * Listener for {@link ItemEvent}

src/main/java/com/l2jserver/model/world/party/PartyEvent.java

@@ -18,7 +18,7 @@ package com.l2jserver.model.world.party;
 
 import com.l2jserver.model.world.Clan;
 import com.l2jserver.model.world.Party;
-import com.l2jserver.model.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldEvent;
 
 /**
  * Base event for {@link Party} objects

src/main/java/com/l2jserver/model/world/party/PartyListener.java

@@ -16,7 +16,7 @@
  */
 package com.l2jserver.model.world.party;
 
-import com.l2jserver.model.world.event.WorldListener;
+import com.l2jserver.service.game.world.event.WorldListener;
 
 /**
  * Listener for {@link PartyEvent}

src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.player;
+package com.l2jserver.model.world.player.event;
 
 import com.l2jserver.model.world.Player;
 import com.l2jserver.model.world.actor.ActorEvent;

src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java

@@ -14,12 +14,12 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.player;
+package com.l2jserver.model.world.player.event;
 
 import com.l2jserver.model.world.actor.ActorEvent;
 import com.l2jserver.model.world.actor.ActorListener;
-import com.l2jserver.model.world.event.WorldEvent;
+import com.l2jserver.service.game.world.event.WorldEvent;
-import com.l2jserver.model.world.event.WorldListener;
+import com.l2jserver.service.game.world.event.WorldListener;
 
 /**
  * Listener for {@link PlayerEvent}

src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.player;
+package com.l2jserver.model.world.player.event;
 
 import com.l2jserver.model.world.Player;
 import com.l2jserver.model.world.capability.Actor;

src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportEvent.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.player;
+package com.l2jserver.model.world.player.event;
 
 import com.l2jserver.model.world.Player;
 import com.l2jserver.util.dimensional.Coordinate;

src/main/java/com/l2jserver/service/game/world/WorldService.java

@@ -20,9 +20,9 @@ import java.util.Iterator;
 import java.util.List;
 
 import com.l2jserver.model.world.WorldObject;
-import com.l2jserver.model.world.filter.WorldObjectFilter;
 import com.l2jserver.service.Service;
 import com.l2jserver.service.game.world.event.WorldEventDispatcher;
+import com.l2jserver.service.game.world.filter.WorldObjectFilter;
 
 /**
  * Service responsible for managing {@link WorldObject} and dispatch events.

src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java

@@ -25,13 +25,13 @@ import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.world.WorldObject;
-import com.l2jserver.model.world.filter.WorldObjectFilter;
-import com.l2jserver.model.world.filter.impl.InstanceFilter;
-import com.l2jserver.model.world.iterator.FilterIterator;
 import com.l2jserver.service.AbstractService;
 import com.l2jserver.service.ServiceStartException;
 import com.l2jserver.service.ServiceStopException;
 import com.l2jserver.service.game.world.event.WorldEventDispatcher;
+import com.l2jserver.service.game.world.filter.FilterIterator;
+import com.l2jserver.service.game.world.filter.WorldObjectFilter;
+import com.l2jserver.service.game.world.filter.impl.InstanceFilter;
 import com.l2jserver.util.factory.CollectionFactory;
 
 /**

src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.event;
+package com.l2jserver.service.game.world.event;
 
 import com.l2jserver.model.world.WorldObject;
 import com.l2jserver.model.world.capability.Listenable;

src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java

@@ -18,8 +18,6 @@ package com.l2jserver.service.game.world.event;
 
 import com.l2jserver.model.id.ObjectID;
 import com.l2jserver.model.world.capability.Listenable;
-import com.l2jserver.model.world.event.WorldEvent;
-import com.l2jserver.model.world.event.WorldListener;
 
 /**
  * This event dispatcher notify listeners that an certain event occured in their

src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java

@@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory;
 
 import com.l2jserver.model.id.ObjectID;
 import com.l2jserver.model.world.capability.Listenable;
-import com.l2jserver.model.world.event.WorldEvent;
-import com.l2jserver.model.world.event.WorldListener;
 import com.l2jserver.util.factory.CollectionFactory;
 
 /**

src/main/java/com/l2jserver/service/game/world/event/WorldListener.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.event;
+package com.l2jserver.service.game.world.event;
 
 /**
  * This is the most abstract listener for the listening engine.

src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter;
+package com.l2jserver.service.game.world.filter;
 
 import com.l2jserver.model.world.WorldObject;
 

src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java

@@ -14,12 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.iterator;
+package com.l2jserver.service.game.world.filter;
 
 import java.util.Iterator;
 
 import com.l2jserver.model.world.WorldObject;
-import com.l2jserver.model.world.filter.WorldObjectFilter;
 
 /**
  * The {@link FilterIterator} takes an {@link WorldObject} and a

src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter;
+package com.l2jserver.service.game.world.filter;
 
 import com.l2jserver.model.world.WorldObject;
 

src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter;
+package com.l2jserver.service.game.world.filter;
 
 import com.l2jserver.model.world.WorldObject;
 

src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter;
+package com.l2jserver.service.game.world.filter;
 
 import com.l2jserver.model.world.WorldObject;
 

src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter;
+package com.l2jserver.service.game.world.filter;
 
 import com.l2jserver.model.world.WorldObject;
 

src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java

@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter.impl;
+package com.l2jserver.service.game.world.filter.impl;
 
 import com.l2jserver.model.id.ObjectID;
 import com.l2jserver.model.world.capability.Positionable;
-import com.l2jserver.model.world.filter.WorldObjectFilter;
+import com.l2jserver.service.game.world.filter.WorldObjectFilter;
 
 /**
  * Filter objects based on its ID.

src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java

@@ -14,10 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter.impl;
+package com.l2jserver.service.game.world.filter.impl;
 
 import com.l2jserver.model.world.WorldObject;
-import com.l2jserver.model.world.filter.WorldObjectFilter;
+import com.l2jserver.service.game.world.filter.WorldObjectFilter;
 
 /**
  * Filter object based on their types

src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java

@@ -14,10 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.world.filter.impl;
+package com.l2jserver.service.game.world.filter.impl;
 
 import com.l2jserver.model.world.capability.Positionable;
-import com.l2jserver.model.world.filter.WorldObjectFilter;
+import com.l2jserver.service.game.world.filter.WorldObjectFilter;
 import com.l2jserver.util.dimensional.Coordinate;
 
 /**

src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java

@@ -36,9 +36,9 @@ import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.item.ItemDropEvent;
 import com.l2jserver.model.world.item.ItemEvent;
 import com.l2jserver.model.world.item.ItemListener;
-import com.l2jserver.model.world.player.PlayerEvent;
+import com.l2jserver.model.world.player.event.PlayerEvent;
-import com.l2jserver.model.world.player.PlayerListener;
+import com.l2jserver.model.world.player.event.PlayerListener;
-import com.l2jserver.model.world.player.PlayerSpawnEvent;
+import com.l2jserver.model.world.player.event.PlayerSpawnEvent;
 import com.l2jserver.service.ServiceModule;
 import com.l2jserver.service.ServiceStartException;
 import com.l2jserver.service.game.world.WorldService;

src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java

@@ -28,12 +28,12 @@ import com.google.inject.Scopes;
 import com.l2jserver.model.world.Item;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.WorldObject;
-import com.l2jserver.model.world.filter.impl.InstanceFilter;
 import com.l2jserver.service.ServiceStartException;
 import com.l2jserver.service.game.world.WorldService;
 import com.l2jserver.service.game.world.WorldServiceImpl;
 import com.l2jserver.service.game.world.event.WorldEventDispatcher;
 import com.l2jserver.service.game.world.event.WorldEventDispatcherImpl;
+import com.l2jserver.service.game.world.filter.impl.InstanceFilter;
 
 public class WorldServiceImplTest {
 	private WorldService world;