Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-08 08:23:11 +00:00
Code Releases Activity

Several changes

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-18 02:18:37 -03:00
parent cd41122035
commit 4c27add4ef
162 changed files with 492 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/l2jserver/model/AbstractModel.java
View File

@@ -35,11 +35,11 @@ public class AbstractModel<T extends ID<?>> implements Model<T> {
@Override
public void setID(T ID) {
if(this.id != null)
if (this.id != null)
throw new IllegalStateException("ID is already set");
this.id = ID;
}
@Override
public int hashCode() {
final int prime = 31;

9
src/main/java/com/l2jserver/model/game/Shortcut.java
View File

@@ -36,7 +36,7 @@ public class Shortcut {
* {@link ShortcutType#SKILL})
*/
private SkillTemplateID skillID;
/**
* The shortcut item id (only if <tt>type</tt> is {@link ShortcutType#ITEM})
*/
@@ -116,8 +116,7 @@ public class Shortcut {
* @param characterType
* the character type
*/
public Shortcut(CharacterID characterID, ItemID itemID,
int characterType) {
public Shortcut(CharacterID characterID, ItemID itemID, int characterType) {
this.type = ShortcutType.ITEM;
this.characterID = characterID;
this.itemID = itemID;
@@ -159,8 +158,8 @@ public class Shortcut {
* @param characterType
* the character type
*/
public Shortcut(CharacterID characterID, ShortcutType type,
int slot, int page, int characterType) {
public Shortcut(CharacterID characterID, ShortcutType type, int slot,
int page, int characterType) {
this.characterID = characterID;
this.slot = slot;
this.page = page;

6
src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java
View File

@@ -23,8 +23,7 @@ import com.l2jserver.model.template.ActorTemplate;
import com.l2jserver.service.game.template.TemplateService;
/**
* An {@link TemplateID} instance representing an {@link ActorTemplate}
* object
* An {@link TemplateID} instance representing an {@link ActorTemplate} object
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@@ -35,8 +34,7 @@ public class ActorTemplateID<T extends ActorTemplate<?>> extends TemplateID<T> {
private final TemplateService templateService;
@Inject
protected ActorTemplateID(@Assisted int id,
TemplateService templateService) {
protected ActorTemplateID(@Assisted int id, TemplateService templateService) {
super(id);
this.templateService = templateService;
}

6
src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java
View File

@@ -23,15 +23,13 @@ import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.service.game.template.TemplateService;
/**
* An {@link TemplateID} instance representing an {@link NPCTemplate}
* object
* An {@link TemplateID} instance representing an {@link NPCTemplate} object
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class NPCTemplateID extends ActorTemplateID<NPCTemplate> {
@Inject
protected NPCTemplateID(@Assisted int id,
TemplateService templateService) {
protected NPCTemplateID(@Assisted int id, TemplateService templateService) {
super(id, templateService);
}
}

9
src/main/java/com/l2jserver/model/template/item/RecipeTemplate.java
View File

@@ -26,9 +26,16 @@ import com.l2jserver.model.world.Item;
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class RecipeTemplate extends ItemTemplate {
private ItemTemplateID item;
protected ItemTemplateID item;
public RecipeTemplate(ItemTemplateID id) {
super(id);
}
/**
* @return the item
*/
public ItemTemplateID getItem() {
return item;
}
}

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

@@ -16,24 +16,15 @@
*/
package com.l2jserver.model.world.actor.event;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
import com.l2jserver.service.game.world.event.FilteredWorldListener;
/**
* This listener will filter to only dispatch {@link ActorEvent} events.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class ActorListener implements WorldListener {
@Override
public boolean dispatch(WorldEvent e) {
if (!(e instanceof ActorEvent))
return false;
return dispatch((ActorEvent) e);
public abstract class ActorListener extends FilteredWorldListener<ActorEvent> {
public ActorListener() {
super(ActorEvent.class);
}
/**
* @see WorldListener#dispatch(WorldEvent)
*/
protected abstract boolean dispatch(ActorEvent e);
}

4
src/main/java/com/l2jserver/model/world/character/CharacterClass.java
View File

@@ -34,8 +34,8 @@ public enum CharacterClass {
0x09, ROGUE),
// 3rd classes
DUELIST(0x58, GLADIATOR), DREADNOUGHT(0x59, WARLORD), PHOENIX_KNIGHT(0x5a,
PALADIN), HELL_KNIGHT(0x5b, DARK_AVENGER), SAGITTARIUS(0x5c, HAWKEYE), ADVENTURER(
0x5d, TREASURE_HUNTER),
PALADIN), HELL_KNIGHT(0x5b, DARK_AVENGER), SAGITTARIUS(0x5c,
HAWKEYE), ADVENTURER(0x5d, TREASURE_HUNTER),
/**
* Human mystic

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

@@ -16,24 +16,16 @@
*/
package com.l2jserver.model.world.character.event;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
import com.l2jserver.service.game.world.event.FilteredWorldListener;
/**
* This listener will filter to only dispatch {@link CharacterEvent} events.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class CharacterListener implements WorldListener {
@Override
public boolean dispatch(WorldEvent e) {
if (!(e instanceof CharacterEvent))
return false;
return dispatch((CharacterEvent) e);
public abstract class CharacterListener extends
FilteredWorldListener<CharacterEvent> {
public CharacterListener() {
super(CharacterEvent.class);
}
/**
* @see WorldListener#dispatch(WorldEvent)
*/
protected abstract boolean dispatch(CharacterEvent e);
}
}

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

@@ -16,24 +16,15 @@
*/
package com.l2jserver.model.world.clan;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
import com.l2jserver.service.game.world.event.FilteredWorldListener;
/**
* This listener will filter to only dispatch {@link ClanEvent} events.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class ClanListener implements WorldListener {
@Override
public boolean dispatch(WorldEvent e) {
if (!(e instanceof ClanEvent))
return false;
return dispatch((ClanEvent) e);
public abstract class ClanListener extends FilteredWorldListener<ClanEvent> {
public ClanListener() {
super(ClanEvent.class);
}
/**
* @see WorldListener#dispatch(WorldEvent)
*/
protected abstract boolean dispatch(ClanEvent e);
}

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

@@ -29,5 +29,8 @@ public interface SpawnEvent extends WorldEvent {
@Override
Spawnable getObject();
/**
* @return the spawning coordinate
*/
Coordinate getCoordinate();
}

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

@@ -16,24 +16,15 @@
*/
package com.l2jserver.model.world.item;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
import com.l2jserver.service.game.world.event.FilteredWorldListener;
/**
* This listener will filter to only dispatch {@link ItemEvent} events.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class ItemListener implements WorldListener {
@Override
public boolean dispatch(WorldEvent e) {
if (!(e instanceof ItemEvent))
return false;
return dispatch((ItemEvent) e);
public abstract class ItemListener extends FilteredWorldListener<ItemEvent> {
public ItemListener() {
super(ItemEvent.class);
}
/**
* @see WorldListener#dispatch(WorldEvent)
*/
protected abstract boolean dispatch(ItemEvent e);
}

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

@@ -16,24 +16,15 @@
*/
package com.l2jserver.model.world.player.event;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldListener;
import com.l2jserver.service.game.world.event.FilteredWorldListener;
/**
* Listener for {@link PlayerEvent}
* This listener will filter to only dispatch {@link PlayerEvent} events.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class PlayerListener implements WorldListener {
@Override
public boolean dispatch(WorldEvent e) {
if (!(e instanceof PlayerEvent))
return false;
return dispatch((PlayerEvent) e);
public abstract class PlayerListener extends FilteredWorldListener<PlayerEvent> {
public PlayerListener() {
super(PlayerEvent.class);
}
/**
* @see WorldListener#dispatch(WorldEvent)
*/
protected abstract boolean dispatch(PlayerEvent e);
}
}