Changeset 1002

Author: lord_rex

(2010/02/08 19:20) About 2 years ago

PacketBroadcaster Update:
- AbstractLockManager idea of MrPoke.
- AbstractPeriodicTaskManager, like l2j-free.
- I tested it with 2 players it was work fine for me. Please test with more players and report in forum.
SQL Maintance FIX.
Warning cleanup.

Affected files

trunk/AE-go_GameServer/data/scripts/system/database/mysql5/MySQL5InventoryDAO.java Download diff

 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Logger;
 import com.aionemu.gameserver.dao.InventoryDAO;
 import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.PersistentState;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.StorageType;
-import java.util.ArrayList;
 /**
  * @author ATracer

trunk/AE-go_GameServer/data/scripts/system/handlers/admincommands/Add.java Download diff

 import com.aionemu.gameserver.configs.AdminConfig;
 import com.aionemu.gameserver.model.gameobjects.Item;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.items.ItemId;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_INVENTORY_UPDATE;
 import com.aionemu.gameserver.services.ItemService;

trunk/AE-go_GameServer/sql/Update/inventory-rev993.sql Download diff

	1001		1002
1	ALTER TABLE `inventory` ADD `itemLocation` TINYINT( 1 ) DEFAULT '0'	1	ALTER TABLE `inventory` ADD `itemLocation` TINYINT( 1 ) DEFAULT '0';

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

	1001		1002
17	package com.aionemu.gameserver.dao;	17	package com.aionemu.gameserver.dao;
18		18
19	import com.aionemu.gameserver.model.gameobjects.Item;	19	import com.aionemu.gameserver.model.gameobjects.Item;
		20	import com.aionemu.gameserver.model.gameobjects.player.Player;
20	import com.aionemu.gameserver.model.gameobjects.player.Storage;	21	import com.aionemu.gameserver.model.gameobjects.player.Storage;
21	import com.aionemu.gameserver.model.gameobjects.player.Player;
22	import com.aionemu.gameserver.model.gameobjects.player.StorageType;	22	import com.aionemu.gameserver.model.gameobjects.player.StorageType;
23		23
24	/**	24	/**

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

	1001		1002
16	*/	16	*/
17	package com.aionemu.gameserver;	17	package com.aionemu.gameserver;
18		18
		19	import java.util.HashSet;
		20	import java.util.Set;
		21
19	import org.apache.log4j.Logger;	22	import org.apache.log4j.Logger;
20		23
21	import com.aionemu.commons.database.DatabaseFactory;	24	import com.aionemu.commons.database.DatabaseFactory;
...		...
114	Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownHook(gs.injector)));	117	Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownHook(gs.injector)));
115		118
116	//gs.injector.getInstance(com.aionemu.gameserver.utils.chathandlers.ChatHandlers.class);	119	//gs.injector.getInstance(com.aionemu.gameserver.utils.chathandlers.ChatHandlers.class);
		120	onStartup();
117	}	121	}
118		122
119	/**	123	/**
...		...
165	// Initialize thread pools	169	// Initialize thread pools
166	ThreadPoolManager.getInstance();	170	ThreadPoolManager.getInstance();
167	}	171	}
		172
		173	private static Set<StartupHook> STARTUP_HOOKS = new HashSet<StartupHook>();
		174
		175	public synchronized static void addStartupHook(StartupHook hook)
		176	{
		177	if (STARTUP_HOOKS != null)
		178	STARTUP_HOOKS.add(hook);
		179	else
		180	hook.onStartup();
		181	}
		182
		183	private synchronized static void onStartup()
		184	{
		185	final Set<StartupHook> startupHooks = STARTUP_HOOKS;
		186
		187	STARTUP_HOOKS = null;
		188
		189	for (StartupHook hook : startupHooks)
		190	hook.onStartup();
		191	}
		192
		193	public interface StartupHook
		194	{
		195	public void onStartup();
		196	}
168	}	197	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/itemengine/actions/SkillUseAction.java Download diff

 import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
-import com.aionemu.gameserver.network.aion.serverpackets.SM_DELETE_ITEM;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_ITEM_USAGE_ANIMATION;
-import com.aionemu.gameserver.network.aion.serverpackets.SM_UPDATE_ITEM;
 import com.aionemu.gameserver.skillengine.SkillEngine;
 import com.aionemu.gameserver.skillengine.model.Skill;
 import com.aionemu.gameserver.skillengine.model.Skill.SkillType;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/account/PlayerAccountData.java Download diff

	1001		1002
18		18
19	import java.sql.Timestamp;	19	import java.sql.Timestamp;
20		20
21	import com.aionemu.gameserver.model.gameobjects.player.Storage;
22	import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;	21	import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;
23	import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;	22	import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;
		23	import com.aionemu.gameserver.model.gameobjects.player.Storage;
24		24
25	/**	25	/**
26	* This class is holding information about player, that is displayed on char selection screen, such as: player	26	* This class is holding information about player, that is displayed on char selection screen, such as: player

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

 package com.aionemu.gameserver.model.gameobjects.player;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.Collections;
 import com.aionemu.commons.callbacks.Enhancable;
 import com.aionemu.gameserver.controllers.PlayerController;
 import com.aionemu.gameserver.model.Gender;
 import com.aionemu.gameserver.model.PlayerClass;
 import com.aionemu.gameserver.model.gameobjects.Creature;
+import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.Npc;
 import com.aionemu.gameserver.model.gameobjects.VisibleObject;
 import com.aionemu.gameserver.model.gameobjects.player.listeners.PlayerLoggedInListener;
 import com.aionemu.gameserver.model.gameobjects.player.listeners.PlayerLoggedOutListener;
-import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.stats.PlayerGameStats;
 import com.aionemu.gameserver.model.gameobjects.stats.PlayerLifeStats;
 import com.aionemu.gameserver.model.group.PlayerGroup;

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

 import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Logger;
 import com.aionemu.commons.database.dao.DAOManager;
 import com.aionemu.gameserver.model.templates.item.ArmorType;
 import com.aionemu.gameserver.model.templates.item.WeaponType;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_DELETE_ITEM;
+import com.aionemu.gameserver.network.aion.serverpackets.SM_EMOTION;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_SYSTEM_MESSAGE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_UPDATE_ITEM;
-import com.aionemu.gameserver.network.aion.serverpackets.SM_EMOTION;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_UPDATE_WAREHOUSE_ITEM;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 	 */
 	public boolean switchHands(int itemUniqueId, int slot)
 	{
+		@SuppressWarnings("unused")
 		Item mainHandItem = owner.getEquipment().get(ItemSlot.MAIN_HAND.getSlotIdMask());
+		@SuppressWarnings("unused")
 		Item subHandItem = owner.getEquipment().get(ItemSlot.SUB_HAND.getSlotIdMask());
+		@SuppressWarnings("unused")
 		Item mainOffHandItem = owner.getEquipment().get(ItemSlot.MAIN_OFF_HAND.getSlotIdMask());
+		@SuppressWarnings("unused")
 		Item subOffHandItem = owner.getEquipment().get(ItemSlot.SUB_OFF_HAND.getSlotIdMask());
 		//TODO switch items
 		return false;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_DELETE_ITEM.java Download diff

 package com.aionemu.gameserver.network.aion.clientpackets;
 import com.aionemu.gameserver.model.gameobjects.Item;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_DELETE_ITEM;
 /**

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_DIALOG_SELECT.java Download diff

 import com.aionemu.gameserver.questEngine.model.QuestEnv;
 import com.aionemu.gameserver.services.ClassChangeService;
 import com.aionemu.gameserver.services.CubeExpandService;
+import com.aionemu.gameserver.utils.MathUtil;
 import com.aionemu.gameserver.utils.PacketSendUtility;
-import com.aionemu.gameserver.utils.MathUtil;
 import com.google.inject.Inject;
 /**

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_ENTER_WORLD.java Download diff

 import com.aionemu.gameserver.model.account.AccountTime;
 import com.aionemu.gameserver.model.account.PlayerAccountData;
 import com.aionemu.gameserver.model.gameobjects.Item;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.templates.BindPointTemplate;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.AionConnection;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_EQUIP_ITEM.java Download diff

  */
 package com.aionemu.gameserver.network.aion.clientpackets;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_UPDATE_PLAYER_APPEARANCE;
 import com.aionemu.gameserver.utils.PacketSendUtility;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_MOVE_ITEM.java Download diff

  */
 package com.aionemu.gameserver.network.aion.clientpackets;
-import org.apache.log4j.Logger;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_EMOTION;
 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 import com.google.inject.Inject;
 /**
- *
  * @author alexa026, kosyachok
  *
  */
 	@Inject
 	private ItemService itemService;
-	private static final Logger	log	= Logger.getLogger(CM_MOVE_ITEM.class);
 	/**
 	 * Target object id that client wants to TALK WITH or 0 if wants to unselect
 	 */
 	private int					targetObjectId;
 	private int					source;
 	private int                                     destination;
+	@SuppressWarnings("unused")
 	private int					slot;
 	/**
 	 * Constructs new instance of <tt>CM_CM_REQUEST_DIALOG </tt> packet

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_SPLIT_ITEM.java Download diff

	1001		1002
35	{	35	{
36	sourceItemObjId = readD(); // drag item unique ID. If merging and itemCount becoming null, this item must be deleted.	36	sourceItemObjId = readD(); // drag item unique ID. If merging and itemCount becoming null, this item must be deleted.
37	itemAmount = readD(); // Items count to be moved.	37	itemAmount = readD(); // Items count to be moved.
		38	@SuppressWarnings("unused")
38	byte[] zeros = readB(4); // Nothing	39	byte[] zeros = readB(4); // Nothing
39	sourceStorageType = readC(); // Source storage	40	sourceStorageType = readC(); // Source storage
40	destinationItemObjId = readD(); // Destination item unique ID if merging. Null if spliting.	41	destinationItemObjId = readD(); // Destination item unique ID if merging. Null if spliting.

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_TELEPORT_SELECT.java Download diff

 import com.aionemu.gameserver.dataholders.DataManager;
 import com.aionemu.gameserver.model.gameobjects.Npc;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.templates.teleport.TelelocationTemplate;
 import com.aionemu.gameserver.model.templates.teleport.TeleporterTemplate;
 import com.aionemu.gameserver.network.aion.AionClientPacket;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_VIEW_PLAYER_DETAILS.java Download diff

	1001		1002
18		18
19	import org.apache.log4j.Logger;	19	import org.apache.log4j.Logger;
20		20
		21	import com.aionemu.gameserver.model.gameobjects.player.Player;
21	import com.aionemu.gameserver.model.gameobjects.player.Storage;	22	import com.aionemu.gameserver.model.gameobjects.player.Storage;
22	import com.aionemu.gameserver.model.gameobjects.player.Player;
23	import com.aionemu.gameserver.network.aion.AionClientPacket;	23	import com.aionemu.gameserver.network.aion.AionClientPacket;
24	import com.aionemu.gameserver.network.aion.serverpackets.SM_VIEW_PLAYER_DETAILS;	24	import com.aionemu.gameserver.network.aion.serverpackets.SM_VIEW_PLAYER_DETAILS;
25	import com.aionemu.gameserver.world.World;	25	import com.aionemu.gameserver.world.World;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_WAREHOUSE_INFO.java Download diff

 package com.aionemu.gameserver.network.aion.serverpackets;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.List;
-import java.nio.ByteBuffer;
-import com.aionemu.gameserver.network.aion.AionConnection;
 import com.aionemu.gameserver.model.gameobjects.Item;
+import com.aionemu.gameserver.model.items.ItemId;
 import com.aionemu.gameserver.model.templates.item.ItemTemplate;
-import com.aionemu.gameserver.model.items.ItemId;
+import com.aionemu.gameserver.network.aion.AionConnection;
 import com.aionemu.gameserver.network.aion.InventoryPacket;
-import java.util.ArrayList;
 /**
  *
  * @author kosyachok

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_WAREHOUSE_UPDATE.java Download diff

 import java.nio.ByteBuffer;
-import com.aionemu.gameserver.network.aion.AionConnection;
 import com.aionemu.gameserver.model.gameobjects.Item;
+import com.aionemu.gameserver.model.items.ItemId;
 import com.aionemu.gameserver.model.templates.item.ItemTemplate;
-import com.aionemu.gameserver.model.items.ItemId;
+import com.aionemu.gameserver.network.aion.AionConnection;
 import com.aionemu.gameserver.network.aion.InventoryPacket;
 /**
  *

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/factories/AionPacketHandlerFactory.java Download diff

 import com.aionemu.gameserver.network.aion.clientpackets.CM_CHECK_NICKNAME;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_CLIENT_COMMAND_LOC;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_CLOSE_DIALOG;
-import com.aionemu.gameserver.network.aion.clientpackets.CM_MOVE_ITEM;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_CREATE_CHARACTER;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_CUSTOM_SETTINGS;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_DELETE_CHARACTER;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_MAY_LOGIN_INTO_GAME;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_MAY_QUIT;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_MOVE;
+import com.aionemu.gameserver.network.aion.clientpackets.CM_MOVE_ITEM;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_OBJECT_SEARCH;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_PING;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_PING_REQUEST;

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

 import static com.aionemu.gameserver.configs.Config.QUEST_XP_RATE;
 import com.aionemu.gameserver.model.PlayerClass;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.templates.QuestTemplate;
 import com.aionemu.gameserver.model.templates.quest.CollectItem;
 import com.aionemu.gameserver.model.templates.quest.CollectItems;

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

 import com.aionemu.gameserver.model.account.Account;
 import com.aionemu.gameserver.model.account.AccountTime;
 import com.aionemu.gameserver.model.account.PlayerAccountData;
-import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;
 import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;
+import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.StorageType;
 import com.aionemu.gameserver.utils.collections.cachemap.CacheMap;
 import com.aionemu.gameserver.utils.collections.cachemap.CacheMapFactory;

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

 import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.PersistentState;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.trade.Exchange;
 import com.aionemu.gameserver.model.trade.ExchangeItem;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_DELETE_ITEM;

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

 import com.aionemu.gameserver.dao.ItemStoneListDAO;
 import com.aionemu.gameserver.dataholders.DataManager;
 import com.aionemu.gameserver.model.gameobjects.Item;
-import com.aionemu.gameserver.model.gameobjects.PersistentState;
-import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
+import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.StorageType;
 import com.aionemu.gameserver.model.gameobjects.stats.listeners.ItemEquipmentListener;
 import com.aionemu.gameserver.model.items.ItemId;

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

 import com.aionemu.gameserver.dataholders.PlayerInitialData.PlayerCreationData.ItemType;
 import com.aionemu.gameserver.model.account.PlayerAccountData;
 import com.aionemu.gameserver.model.gameobjects.Item;
-import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.MacroList;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;
 import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;
+import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.StorageType;
 import com.aionemu.gameserver.model.gameobjects.stats.PlayerGameStats;
 import com.aionemu.gameserver.model.gameobjects.stats.PlayerLifeStats;

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

 import com.aionemu.gameserver.dataholders.DataManager;
 import com.aionemu.gameserver.model.ChatType;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.state.CreatureState;
 import com.aionemu.gameserver.model.templates.teleport.TelelocationTemplate;
 import com.aionemu.gameserver.model.templates.teleport.TeleportLocation;

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

 import com.aionemu.gameserver.dataholders.TradeListData;
 import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.Npc;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.templates.TradeListTemplate;
 import com.aionemu.gameserver.model.templates.TradeListTemplate.TradeTab;
 import com.aionemu.gameserver.model.templates.goods.GoodsList;

trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/action/ItemUseAction.java Download diff

	1001		1002
21	import javax.xml.bind.annotation.XmlAttribute;	21	import javax.xml.bind.annotation.XmlAttribute;
22	import javax.xml.bind.annotation.XmlType;	22	import javax.xml.bind.annotation.XmlType;
23		23
		24	import com.aionemu.gameserver.model.gameobjects.player.Player;
24	import com.aionemu.gameserver.model.gameobjects.player.Storage;	25	import com.aionemu.gameserver.model.gameobjects.player.Storage;
25	import com.aionemu.gameserver.model.gameobjects.player.Player;
26	import com.aionemu.gameserver.skillengine.model.Skill;	26	import com.aionemu.gameserver.skillengine.model.Skill;
27		27
28	/**	28	/**

trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/properties/FirstTargetProperty.java Download diff

	1001		1002
22	import javax.xml.bind.annotation.XmlAttribute;	22	import javax.xml.bind.annotation.XmlAttribute;
23	import javax.xml.bind.annotation.XmlType;	23	import javax.xml.bind.annotation.XmlType;
24		24
25	import com.aionemu.gameserver.restrictions.RestrictionsManager;
26	import com.aionemu.gameserver.skillengine.model.Skill;	25	import com.aionemu.gameserver.skillengine.model.Skill;
27		26
28		27

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

Show contents

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

Show contents

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

  */
 package com.aionemu.gameserver.taskmanager;
-import java.util.HashSet;
-import java.util.Iterator;
-import org.apache.log4j.Logger;
 import com.aionemu.gameserver.model.gameobjects.Creature;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
-import com.aionemu.gameserver.utils.ThreadPoolManager;
 /**
  * @author lord_rex and MrPoke
  *
  */
-public class PacketBroadcaster implements Runnable
+public class PacketBroadcaster extends AbstractPeriodicTaskManager<Creature>
 {
-	private static final Logger		log		= Logger.getLogger(PacketBroadcaster.class);
-	private final HashSet<Creature>	SET	= new HashSet<Creature>();
 	private static final class SingletonHolder
 	{
 		private static final PacketBroadcaster	INSTANCE	= new PacketBroadcaster();
 	private PacketBroadcaster()
 	{
-		ThreadPoolManager.getInstance().scheduleAtFixedRate(this, 100, 100);
+		super(100);
-		log.info("PacketBroadcaster: Initialized.");
 	}
 	public static enum BroadcastMode
 	private static final BroadcastMode[]	VALUES	= BroadcastMode.values();
-	public void add(Creature creature)
-	{
-		synchronized(SET)
-		{
-			SET.add(creature);
-		}
-	}
 	@Override
-	public void run()
+	protected void callTask(Creature creature)
 	{
-		Iterator<Creature> it = SET.iterator();
+		for(byte mask; (mask = creature.getPacketBroadcastMask()) != 0;)
-		while(it.hasNext())
 		{
-			Creature creature = it.next();
+			for(BroadcastMode mode : VALUES)
-			synchronized(SET)
 			{
-				SET.remove(creature);
+				mode.trySendPacket(creature, mask);
 			}
-			for(byte mask; (mask = creature.getPacketBroadcastMask()) != 0;)
-			{
-				for(BroadcastMode mode : VALUES) {
-					mode.trySendPacket(creature, mask);
-				}
-			}
 		}
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/utils/stats/StatFunctions.java Download diff

 import com.aionemu.gameserver.model.gameobjects.Creature;
 import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.Npc;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.Storage;
-import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.state.CreatureState;
 import com.aionemu.gameserver.model.gameobjects.stats.CreatureGameStats;
 import com.aionemu.gameserver.model.gameobjects.stats.StatEnum;