2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-07 16:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate code in NpcActionVerificationHandler.

Browse Source
This commit is contained in:
Major-
2014-07-22 00:32:18 +01:00
parent e574cdecbb
commit b2263f1637
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/game/event/handler/impl/NpcActionVerificationHandler.java
+7 -4
View File
@@ -4,32 +4,35 @@ import org.apollo.game.event.handler.EventHandler;
import org.apollo.game.event.handler.EventHandlerContext; import org.apollo.game.event.handler.EventHandlerContext;
import org.apollo.game.event.impl.NpcActionEvent; import org.apollo.game.event.impl.NpcActionEvent;
import org.apollo.game.model.World; import org.apollo.game.model.World;
import org.apollo.game.model.WorldConstants;
import org.apollo.game.model.entity.Npc; import org.apollo.game.model.entity.Npc;
import org.apollo.game.model.entity.Player; import org.apollo.game.model.entity.Player;
import org.apollo.util.MobRepository;
/** /**
* A verification {@link EventHandler} for the {@link NpcActionEvent}. * A verification {@link EventHandler} for the {@link NpcActionEvent}.
* *
* @author Stuart * @author Stuart
* @author Major
*/ */
public final class NpcActionVerificationHandler extends EventHandler<NpcActionEvent> { public final class NpcActionVerificationHandler extends EventHandler<NpcActionEvent> {
@Override @Override
public void handle(EventHandlerContext ctx, Player player, NpcActionEvent event) { public void handle(EventHandlerContext ctx, Player player, NpcActionEvent event) {
if (event.getIndex() < 0 || event.getIndex() >= WorldConstants.MAXIMUM_NPCS) { MobRepository<Npc> repository = World.getWorld().getNpcRepository();
int index = event.getIndex();
if (index < 0 || index >= repository.capacity()) {
ctx.breakHandlerChain(); ctx.breakHandlerChain();
return; return;
} }
Npc npc = World.getWorld().getNpcRepository().get(event.getIndex()); Npc npc = repository.get(index);
if (npc == null || !player.getPosition().isWithinDistance(npc.getPosition(), 15)) { if (npc == null || !player.getPosition().isWithinDistance(npc.getPosition(), 15)) {
ctx.breakHandlerChain(); ctx.breakHandlerChain();
return; return;
} }
// TODO is this right?
if (event.getOption() >= npc.getDefinition().getInteractions().length) { if (event.getOption() >= npc.getDefinition().getInteractions().length) {
ctx.breakHandlerChain(); ctx.breakHandlerChain();
return; return;