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

Service exceptions externalized and better logging configuration

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-21 22:41:27 -03:00
parent ab38e7d5ba
commit b3ff0795ec
44 changed files with 559 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/l2jserver/model/template/NPCTemplate.java
View File

@@ -27,10 +27,11 @@ import com.l2jserver.model.world.AbstractActor.Race;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.NPC;
import com.l2jserver.model.world.capability.Actor;
import com.l2jserver.service.game.CharacterService;
import com.l2jserver.service.game.CharacterService.CannotSetTargetServiceException;
import com.l2jserver.service.game.character.CannotSetTargetServiceException;
import com.l2jserver.service.game.character.CharacterService;
import com.l2jserver.service.network.NetworkService;
import com.l2jserver.util.calculator.Calculator;
import com.l2jserver.util.exception.L2Exception;
import com.l2jserver.util.html.markup.HtmlTemplate;
import com.l2jserver.util.html.markup.MarkupTag;
@@ -101,8 +102,11 @@ public abstract class NPCTemplate extends ActorTemplate<NPC> {
* the interacting character
* @param action
* the action performed
* @throws L2Exception
* any {@link L2Exception}
*/
public void action(NPC npc, L2Character character, CharacterAction action) {
public void action(NPC npc, L2Character character, CharacterAction action)
throws L2Exception {
final Lineage2Connection conn = networkService.discover(character
.getID());
if (conn == null)

1
src/main/java/com/l2jserver/model/template/npc/DwarfVillageMasterNPCTemplate.java
View File

@@ -17,7 +17,6 @@
package com.l2jserver.model.template.npc;
import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.template.NPCTemplate;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>

1
src/main/java/com/l2jserver/model/template/npc/KamaelVillageMasterNPCTemplate.java
View File

@@ -17,7 +17,6 @@
package com.l2jserver.model.template.npc;
import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.template.NPCTemplate;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>

1
src/main/java/com/l2jserver/model/template/npc/OrcVillageMasterNPCTemplate.java
View File

@@ -17,7 +17,6 @@
package com.l2jserver.model.template.npc;
import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.template.NPCTemplate;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>

20
src/main/java/com/l2jserver/model/world/NPC.java
View File

@@ -16,14 +16,11 @@
*/
package com.l2jserver.model.world;
import com.l2jserver.game.net.packet.client.CharacterActionPacket.CharacterAction;
import com.l2jserver.model.id.TemplateID;
import com.l2jserver.model.id.object.NPCID;
import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.capability.Actor;
import com.l2jserver.service.game.ai.AIScript;
import com.l2jserver.util.calculator.Calculator;
/**
* NPC stand for "Not Playable Character" and is an character that not player
@@ -48,23 +45,6 @@ public class NPC extends AbstractActor {
this.templateID = templateID;
}
/**
* Executes an action on this NPC
*
* @param character
* the interacting character
* @param action
* the action
*/
public void action(L2Character character, CharacterAction action) {
getTemplate().action(this, character, action);
}
public void receiveAttack(Calculator calculator, Actor attacker) {
// TODO add buffs to calculator!
getTemplate().receiveAttack(this, calculator, attacker);
}
/**
* @return the NPC template ID
*/