Changeset 1518

User picture

Author: Simple2008

(2010/03/14 19:58) Almost 2 years ago

Fixed a forgotten TODO (when DuelService was finished)

Affected files

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/CreatureController.java Download diff

15171518
24
import com.aionemu.gameserver.model.gameobjects.Creature;
24
import com.aionemu.gameserver.model.gameobjects.Creature;
25
import com.aionemu.gameserver.model.gameobjects.VisibleObject;
25
import com.aionemu.gameserver.model.gameobjects.VisibleObject;
26
import com.aionemu.gameserver.model.gameobjects.player.Player;
26
import com.aionemu.gameserver.model.gameobjects.player.Player;
 
27
import com.aionemu.gameserver.model.gameobjects.state.CreatureState;



27
import com.aionemu.gameserver.network.aion.serverpackets.SM_MOVE;
28
import com.aionemu.gameserver.network.aion.serverpackets.SM_MOVE;



28
import com.aionemu.gameserver.network.aion.serverpackets.SM_ATTACK_STATUS.TYPE;
29
import com.aionemu.gameserver.network.aion.serverpackets.SM_ATTACK_STATUS.TYPE;



29
import com.aionemu.gameserver.skillengine.model.HopType;
30
import com.aionemu.gameserver.skillengine.model.HopType;


...
...
80
	{
81
	{



81
		this.getOwner().getEffectController().removeAllEffects();
82
		this.getOwner().getEffectController().removeAllEffects();



82
		this.getOwner().getMoveController().stop();
83
		this.getOwner().getMoveController().stop();



84
		this.getOwner().setState(CreatureState.DEAD);



83
	}
85
	}



84
86



85
	/**
87
	/**





          

  Updated
trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/NpcController.java  Download diff




      
      
15171518
123
123



124
		scheduleRespawn();
124
		scheduleRespawn();



125
125



126
		// TODO move to creature controller after duel will be moved out of onDie
126
		// TODO change - now reward is given to target only. Base on Most Hate/Aggro



127
		owner.setState(CreatureState.DEAD);



128
		// TODO change - now reward is given to target only



129
		Player target = (Player) owner.getTarget();
127
		Player target = (Player) owner.getTarget();



130
128



131
		PacketSendUtility.broadcastPacket(owner,
129
		PacketSendUtility.broadcastPacket(owner,





          

  Updated
trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/PlayerController.java  Download diff




      
      
15171518
223
		}
223
		}



224
		else
224
		else



225
		{
225
		{



226
			getOwner().setState(CreatureState.DEAD);



227
			if(player.getLevel() > 4)
226
			if(player.getLevel() > 4)



228
				player.getCommonData().calculateExpLoss();
227
				player.getCommonData().calculateExpLoss();



229
228