moparisthebest/MoparClassic
1
0
Fork 0
mirror of https://github.com/moparisthebest/MoparClassic synced 2024-08-13 15:53:47 -04:00
Code Issues Releases Wiki Activity

#116 - this.stop() + return;

Browse Source
This commit is contained in:
Rodgerwilco 2012-05-04 14:40:49 -07:00
parent 18b63da356
commit fc1444206b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GameServer/src/org/moparscape/msc/gs/event/FightEvent.java
View File

@ -61,13 +61,15 @@ public class FightEvent extends DelayedEvent {
public void run() { public void run() {
if(owner == null || affectedMob == null) { if(owner == null || affectedMob == null) {
this.stop(); this.stop();
return;
} }
if (!owner.loggedIn() if (!owner.loggedIn()
|| (affectedMob instanceof Player && !((Player) affectedMob) || (affectedMob instanceof Player && !((Player) affectedMob)
.loggedIn())) { .loggedIn())) {
owner.resetCombat(CombatState.ERROR); owner.resetCombat(CombatState.ERROR);
affectedMob.resetCombat(CombatState.ERROR); affectedMob.resetCombat(CombatState.ERROR);
this.stop(); this.stop();
return;
} }
Mob attacker, opponent; Mob attacker, opponent;
@ -86,6 +88,7 @@ public class FightEvent extends DelayedEvent {
n.resetCombat(CombatState.ERROR); n.resetCombat(CombatState.ERROR);
owner.resetCombat(CombatState.ERROR); owner.resetCombat(CombatState.ERROR);
this.stop(); this.stop();
return;
} }
} }
if (opponent instanceof Npc) { if (opponent instanceof Npc) {
@ -94,6 +97,7 @@ public class FightEvent extends DelayedEvent {
n.resetCombat(CombatState.ERROR); n.resetCombat(CombatState.ERROR);
owner.resetCombat(CombatState.ERROR); owner.resetCombat(CombatState.ERROR);
this.stop(); this.stop();
return;
} }
} }
if (opponent instanceof Player && attacker instanceof Player) { if (opponent instanceof Player && attacker instanceof Player) {