Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-07 16:03:10 +00:00
Code Releases Activity

Refactored Filters

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-16 15:08:30 -03:00
parent 242616d384
commit df36f9bb32
38 changed files with 322 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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++) {
buffer.writeInt(0x00); // paperdolls
}
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_REAR));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LEAR));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_NECK));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RFINGER));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LFINGER));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HEAD));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RHAND));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LHAND));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_CHEST));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LEGS));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_FEET));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_CLOAK));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RHAND));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR2));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_RBRACELET));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LBRACELET));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO1));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO2));
// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DECO3));
// 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));
writePaperdollItemID(buffer, character, HAIR1);
writePaperdollItemID(buffer, character, RIGHT_EAR);
writePaperdollItemID(buffer, character, LEFT_EAR);
writePaperdollItemID(buffer, character, NECK);
writePaperdollItemID(buffer, character, RIGHT_FINGER);
writePaperdollItemID(buffer, character, LEFT_FINGER);
writePaperdollItemID(buffer, character, HEAD);
writePaperdollItemID(buffer, character, RIGHT_HAND);
writePaperdollItemID(buffer, character, LEFT_HAND);
writePaperdollItemID(buffer, character, GLOVES);
writePaperdollItemID(buffer, character, CHEST);
writePaperdollItemID(buffer, character, LEGS);
writePaperdollItemID(buffer, character, FEET);
writePaperdollItemID(buffer, character, CLOAK);
writePaperdollItemID(buffer, character, RIGHT_HAND);
writePaperdollItemID(buffer, character, HAIR1);
writePaperdollItemID(buffer, character, HAIR2);
writePaperdollItemID(buffer, character, RIGHT_BRACELET);
writePaperdollItemID(buffer, character, LEFT_BRACELET);
writePaperdollItemID(buffer, character, DECORATION_1);
writePaperdollItemID(buffer, character, DECORATION_2);
writePaperdollItemID(buffer, character, DECORATION_3);
writePaperdollItemID(buffer, character, DECORATION_4);
writePaperdollItemID(buffer, character, DECORATION_5);
writePaperdollItemID(buffer, character, 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);
}
}

32
src/main/java/com/l2jserver/model/world/Item.java
View File

@@ -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;
/**
@@ -65,7 +72,10 @@ public class Item extends AbstractObject implements Playable, Spawnable,
* Drop coordinate of this item
*/
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 false;
return (location != null);
}
@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
*/

2
src/main/java/com/l2jserver/model/world/actor/ActorEvent.java
View File

@@ -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

2
src/main/java/com/l2jserver/model/world/actor/ActorListener.java
View File

@@ -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

4
src/main/java/com/l2jserver/model/world/capability/Listenable.java
View File

@@ -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.model.world.event.WorldListener;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
/**
* Defines an {@link AbstractObject} that can attach {@link WorldListener} that

23
src/main/java/com/l2jserver/model/world/character/CharacterInventory.java
View File

@@ -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;
}
/**

34
src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java Normal file
View File

@@ -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();
}

40
src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java Normal file
View File

@@ -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);
}

96
src/main/java/com/l2jserver/model/world/character/event/CharacterLoggedInEvent.java Normal file
View File

@@ -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 };
}
}

2
src/main/java/com/l2jserver/model/world/clan/ClanEvent.java
View File

@@ -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

2
src/main/java/com/l2jserver/model/world/clan/ClanListener.java
View File

@@ -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}

1
src/main/java/com/l2jserver/model/world/event/SpawnEvent.java
View File

@@ -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;
/**

2
src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java
View File

@@ -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.

2
src/main/java/com/l2jserver/model/world/item/ItemEvent.java
View File

@@ -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

2
src/main/java/com/l2jserver/model/world/item/ItemListener.java
View File

@@ -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}

2
src/main/java/com/l2jserver/model/world/party/PartyEvent.java
View File

@@ -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

2
src/main/java/com/l2jserver/model/world/party/PartyListener.java
View File

@@ -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}

2
src/main/java/com/l2jserver/model/world/player/PlayerEvent.java → src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java
View File

@@ -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;

6
src/main/java/com/l2jserver/model/world/player/PlayerListener.java → src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java
View File

@@ -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.model.world.event.WorldListener;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
/**
* Listener for {@link PlayerEvent}

2
src/main/java/com/l2jserver/model/world/player/PlayerSpawnEvent.java → src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java
View File

@@ -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;

2
src/main/java/com/l2jserver/model/world/player/PlayerTeleportEvent.java → src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportEvent.java
View File

@@ -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;

2
src/main/java/com/l2jserver/service/game/world/WorldService.java
View File

@@ -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.

6
src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java
View File

@@ -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;
/**

2
src/main/java/com/l2jserver/model/world/event/WorldEvent.java → src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java
View File

@@ -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;

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

@@ -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

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

@@ -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;
/**

2
src/main/java/com/l2jserver/model/world/event/WorldListener.java → src/main/java/com/l2jserver/service/game/world/event/WorldListener.java
View File

@@ -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.

2
src/main/java/com/l2jserver/model/world/filter/AndFilter.java → src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java
View File

@@ -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;

3
src/main/java/com/l2jserver/model/world/iterator/FilterIterator.java → src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java
View File

@@ -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

2
src/main/java/com/l2jserver/model/world/filter/NotFilter.java → src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java
View File

@@ -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;

2
src/main/java/com/l2jserver/model/world/filter/OrFilter.java → src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java
View File

@@ -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;

2
src/main/java/com/l2jserver/model/world/filter/WorldFilters.java → src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java
View File

@@ -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;

2
src/main/java/com/l2jserver/model/world/filter/WorldObjectFilter.java → src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java
View File

@@ -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;

4
src/main/java/com/l2jserver/model/world/filter/impl/IDFilter.java → src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java
View File

@@ -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.

4
src/main/java/com/l2jserver/model/world/filter/impl/InstanceFilter.java → src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java
View File

@@ -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

4
src/main/java/com/l2jserver/model/world/filter/impl/RangeFilter.java → src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
View File

@@ -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;
/**

6
src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java
View File

@@ -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.PlayerListener;
import com.l2jserver.model.world.player.PlayerSpawnEvent;
import com.l2jserver.model.world.player.event.PlayerEvent;
import com.l2jserver.model.world.player.event.PlayerListener;
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;

2
src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java
View File

@@ -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;