Changeset 990

Author: lord_rex

(2010/02/07 21:58) About 2 years ago

PacketBroadcaster Implemented.
- HP/MP/EffectIcons/NearbyQuest Broadcast.
- Added missing usage of SM_UPDATESTAT_HP, like SM_UPDATESTAT_MP.
- Broadcasting periodically, so even a lot of calls will send queued types only once.
- Lower server/client load.
- Thanks for l2j-free team for base.
- Thanks for MrPoke.

Affected files

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

	989		990
226	owner.getActiveRegion().getWorld().updatePosition(owner, owner.getX(), owner.getY(), owner.getZ(), owner.getHeading());	226	owner.getActiveRegion().getWorld().updatePosition(owner, owner.getX(), owner.getY(), owner.getZ(), owner.getHeading());
227	PacketSendUtility.broadcastPacket(owner, new SM_MOVE(owner, owner.getX(), owner.getY(), owner.getZ(), 0, 0, 0, owner.getHeading(), MovementType.MOVEMENT_STOP));	227	PacketSendUtility.broadcastPacket(owner, new SM_MOVE(owner, owner.getX(), owner.getY(), owner.getZ(), 0, 0, 0, owner.getHeading(), MovementType.MOVEMENT_STOP));
228	}	228	}
		229
		230	public void updateNearbyQuestList()
		231	{
		232	// TODO
		233	}
		234
		235	public void updateNearbyQuestListImpl()
		236	{
		237	// TODO
		238	}
229	}	239	}

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

 import com.aionemu.gameserver.network.aion.serverpackets.SM_ABNORMAL_EFFECT;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_ABNORMAL_STATE;
 import com.aionemu.gameserver.skillengine.model.Effect;
+import com.aionemu.gameserver.taskmanager.PacketBroadcaster.BroadcastMode;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 /**
 	}
 	/**
-	 *  Adds icon of effect to owner (only for Player objects)
-	 *
-	 * @param effect
-	 */
-	public void updatePlayerEffectIcons()
-	{
-		PacketSendUtility.sendPacket((Player) owner,
-			new SM_ABNORMAL_STATE(effectMap.values().toArray(new Effect[effectMap.size()])));
-	}
-	/**
 	 *
 	 * @param effect
 	 */
 	{
 		return abnormals;
 	}
+	public void updatePlayerEffectIcons()
+	{
+		getOwner().addPacketBroadcastMask(BroadcastMode.UPDATE_PLAYER_EFFECT_ICONS);
+	}
+	public void updatePlayerEffectIconsImpl()
+	{
+		PacketSendUtility.sendPacket((Player) owner,
+			new SM_ABNORMAL_STATE(effectMap.values().toArray(new Effect[effectMap.size()])));
+	}
 }

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

 import com.aionemu.gameserver.skillengine.model.HopType;
 import com.aionemu.gameserver.skillengine.model.Skill;
 import com.aionemu.gameserver.skillengine.model.Skill.SkillType;
+import com.aionemu.gameserver.taskmanager.PacketBroadcaster.BroadcastMode;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 import com.aionemu.gameserver.utils.ThreadPoolManager;
 import com.aionemu.gameserver.world.World;
 				}
 			}
 			if (update)
-				PacketSendUtility.sendPacket( getOwner(), new SM_NEARBY_QUESTS(getOwner().getNearbyQuests()));
+				updateNearbyQuestList();
 		}
 		else if(object instanceof Gatherable)
 		{
 				}
 			}
 			if (update)
-				PacketSendUtility.sendPacket( getOwner(), new SM_NEARBY_QUESTS(getOwner().getNearbyQuests()));
+				updateNearbyQuestList();
 		}
 		PacketSendUtility.sendPacket(getOwner(), new SM_DELETE(object));
     public boolean isEnemy (Player player) {
         return player.getCommonData().getRace() != getOwner().getCommonData().getRace();
     }
+	@Override
+	public void updateNearbyQuestList()
+	{
+		getOwner().addPacketBroadcastMask(BroadcastMode.UPDATE_NEARBY_QUEST_LIST);
+	}
+	@Override
+	public void updateNearbyQuestListImpl()
+	{
+		PacketSendUtility.sendPacket(getOwner(), new SM_NEARBY_QUESTS(getOwner().getNearbyQuests()));
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/GameServer.java Download diff

 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.skillengine.SkillEngine;
 import com.aionemu.gameserver.spawnengine.SpawnEngine;
+import com.aionemu.gameserver.taskmanager.PacketBroadcaster;
 import com.aionemu.gameserver.utils.DeadlockDetector;
 import com.aionemu.gameserver.utils.ThreadPoolManager;
 import com.aionemu.gameserver.utils.ThreadUncaughtExceptionHandler;
 		QuestEngine.getInstance().setItemService(gs.injector.getInstance(ItemService.class), gs.injector.getInstance(SpawnEngine.class));
 		ZoneManager.getInstance().initializeZones();
 		QuestHandlersManager.init(gs.injector);
+		PacketBroadcaster.getInstance();
 		Util.printMemoryUsage(log);
 		log.info("#################################################");
 		log.info("AE Game Server started in " + (System.currentTimeMillis() - start) / 1000 + " seconds.");

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/Creature.java Download diff

	989		990
26	import com.aionemu.gameserver.model.templates.VisibleObjectTemplate;	26	import com.aionemu.gameserver.model.templates.VisibleObjectTemplate;
27	import com.aionemu.gameserver.model.templates.spawn.SpawnTemplate;	27	import com.aionemu.gameserver.model.templates.spawn.SpawnTemplate;
28	import com.aionemu.gameserver.skillengine.model.Skill;	28	import com.aionemu.gameserver.skillengine.model.Skill;
		29	import com.aionemu.gameserver.taskmanager.PacketBroadcaster;
		30	import com.aionemu.gameserver.taskmanager.PacketBroadcaster.BroadcastMode;
29	import com.aionemu.gameserver.world.WorldPosition;	31	import com.aionemu.gameserver.world.WorldPosition;
30		32
31	/**	33	/**
...		...
315	{	317	{
316	return moveController;	318	return moveController;
317	}	319	}
		320
		321	private volatile byte packetBroadcastMask;
		322
		323	public final void addPacketBroadcastMask(BroadcastMode mode)
		324	{
		325	packetBroadcastMask \|= mode.mask();
		326
		327	PacketBroadcaster.getInstance().add(this);
		328	}
		329
		330	public final void removePacketBroadcastMask(BroadcastMode mode)
		331	{
		332	packetBroadcastMask &= ~mode.mask();
		333	}
		334
		335	public final byte getPacketBroadcastMask()
		336	{
		337	return packetBroadcastMask;
		338	}
318	}	339	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/stats/CreatureLifeStats.java Download diff

 		return currentMp;
 	}
-	/**
+	protected void sendAttackStatusPacketUpdate()
-	 * Informs about HP change
-	 */
-	protected void sendHpPacketUpdate()
 	{
 		if(owner == null)
 		{

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/stats/NpcLifeStats.java Download diff

	989		990
36	@Override	36	@Override
37	protected void onIncreaseHp()	37	protected void onIncreaseHp()
38	{	38	{
39	sendHpPacketUpdate();	39	sendAttackStatusPacketUpdate();
40	}	40	}
41		41
42	@Override	42	@Override

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/stats/PlayerLifeStats.java Download diff

 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.state.CreatureState;
 import com.aionemu.gameserver.model.group.GroupEvent;
+import com.aionemu.gameserver.network.aion.serverpackets.SM_STATUPDATE_HP;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_STATUPDATE_MP;
+import com.aionemu.gameserver.taskmanager.PacketBroadcaster.BroadcastMode;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 /**
 	@Override
 	protected void onReduceHp()
 	{
+		sendHpPacketUpdate();
 		triggerRestoreTask();
 		sendGroupPacketUpdate();
 	}
 	protected void onIncreaseHp()
 	{
 		sendHpPacketUpdate();
+		sendAttackStatusPacketUpdate();
 		sendGroupPacketUpdate();
 	}
-	/**
-	 * Informs player about MP change
-	 */
-	private void sendMpPacketUpdate()
-	{
-		if(owner == null)
-			return;
-		PacketSendUtility.sendPacket((Player) owner, new SM_STATUPDATE_MP(currentMp, getMaxMp()));
-	}
 	private void sendGroupPacketUpdate()
 	{
 			currentRegenMp *= 8;
 		increaseMp(currentRegenMp);
 	}
+	public void sendHpPacketUpdate()
+	{
+		owner.addPacketBroadcastMask(BroadcastMode.UPDATE_PLAYER_HP_STAT);
+	}
+	public void sendHpPacketUpdateImpl()
+	{
+		if(owner == null)
+			return;
+		PacketSendUtility.sendPacket((Player) owner, new SM_STATUPDATE_HP(currentHp, getMaxHp()));
+	}
+	public void sendMpPacketUpdate()
+	{
+		owner.addPacketBroadcastMask(BroadcastMode.UPDATE_PLAYER_MP_STAT);
+	}
+	public void sendMpPacketUpdateImpl()
+	{
+		if(owner == null)
+			return;
+		PacketSendUtility.sendPacket((Player) owner, new SM_STATUPDATE_MP(currentMp, getMaxMp()));
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/taskmanager/PacketBroadcaster.java

Show contents