Changeset 1526

User picture

Author: lord_rex

(2010/03/14 22:35) Almost 2 years ago

Warning cleanup

Affected files

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

15251526
16
 */
16
 */
17
package admincommands;
17
package admincommands;
18
18
19
import java.util.Iterator;
20
import java.util.List;
21
22
import com.aionemu.gameserver.configs.administration.AdminConfig;
19
import com.aionemu.gameserver.configs.administration.AdminConfig;
23
import com.aionemu.gameserver.model.gameobjects.Item;
20
import com.aionemu.gameserver.model.gameobjects.Item;
24
import com.aionemu.gameserver.model.gameobjects.player.Player;
21
import com.aionemu.gameserver.model.gameobjects.player.Player;
...
...
35
 * @author Phantom, ATracer
32
 * @author Phantom, ATracer
36
 *
33
 *
37
 */
34
 */
38
39
public class Remove extends AdminCommand
35
public class Remove extends AdminCommand
40
{
36
{
41
	@Inject
37
	@Inject

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

15251526
119
			new Thread(new DeadlockDetector(TaskManagerConfig.DEADLOCK_DETECTOR_INTERVAL)).start();
119
			new Thread(new DeadlockDetector(TaskManagerConfig.DEADLOCK_DETECTOR_INTERVAL)).start();
120
		}
120
		}
121
		
121
		
122
		
123
		Runtime.getRuntime().addShutdownHook(gs.injector.getInstance(ShutdownHook.class));
122
		Runtime.getRuntime().addShutdownHook(gs.injector.getInstance(ShutdownHook.class));
124
123
125
		//gs.injector.getInstance(com.aionemu.gameserver.utils.chathandlers.ChatHandlers.class);
124
		//gs.injector.getInstance(com.aionemu.gameserver.utils.chathandlers.ChatHandlers.class);

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

15251526
33
 */
33
 */
34
public abstract class CreatureLifeStats<T extends Creature>
34
public abstract class CreatureLifeStats<T extends Creature>
35
{
35
{
36
	@SuppressWarnings("unused")
37
	private static final Logger log = Logger.getLogger(CreatureLifeStats.class);
36
	private static final Logger log = Logger.getLogger(CreatureLifeStats.class);
38
37
39
	protected int currentHp;
38
	protected int currentHp;

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

15251526
71
		@Override
71
		@Override
72
		public void run()
72
		public void run()
73
		{
73
		{
74
			log.info("Player update task started");
74
			log.info("Player update task started.");
75
			long startTime = System.currentTimeMillis();
75
			long startTime = System.currentTimeMillis();
76
			Iterator<Player> playersIterator = world.getPlayersIterator();
76
			Iterator<Player> playersIterator = world.getPlayersIterator();
77
			int playersUpdated = 0;
77
			int playersUpdated = 0;
...
...
93
				playersUpdated++;
93
				playersUpdated++;
94
			}
94
			}
95
			long workTime = System.currentTimeMillis() - startTime;
95
			long workTime = System.currentTimeMillis() - startTime;
96
			log.info("Player update: " + workTime + " ms, players: " + playersUpdated);
96
			log.info("Player update: " + workTime + " ms, players: " + playersUpdated + ".");
97
		}
97
		}
98
	}
98
	}
99
99
...
...
102
		@Override
102
		@Override
103
		public void run()
103
		public void run()
104
		{
104
		{
105
			log.info("Player item update task started");
105
			log.info("Player item update task started.");
106
			long startTime = System.currentTimeMillis();
106
			long startTime = System.currentTimeMillis();
107
			Iterator<Player> playersIterator = world.getPlayersIterator();
107
			Iterator<Player> playersIterator = world.getPlayersIterator();
108
			int playersUpdated = 0;
108
			int playersUpdated = 0;
...
...
122
				playersUpdated++;
122
				playersUpdated++;
123
			}
123
			}
124
			long workTime = System.currentTimeMillis() - startTime;
124
			long workTime = System.currentTimeMillis() - startTime;
125
			log.info("Player item update: " + workTime + " ms, players: " + playersUpdated);
125
			log.info("Player item update: " + workTime + " ms, players: " + playersUpdated + ".");
126
		}
126
		}
127
	}
127
	}
128
	
128
	
...
...
131
		@Override
131
		@Override
132
		public void run()
132
		public void run()
133
		{
133
		{
134
			log.info("Legion WH update task started");
134
			log.info("Legion WH update task started.");
135
			long startTime = System.currentTimeMillis();
135
			long startTime = System.currentTimeMillis();
136
			Iterator<Legion> legionsIterator = legionService.getCachedLegionIterator();
136
			Iterator<Legion> legionsIterator = legionService.getCachedLegionIterator();
137
			int legionWhUpdated = 0;
137
			int legionWhUpdated = 0;
...
...
174
				legionWhUpdated++;
174
				legionWhUpdated++;
175
			}
175
			}
176
			long workTime = System.currentTimeMillis() - startTime;
176
			long workTime = System.currentTimeMillis() - startTime;
177
			log.info("Legion WH update: " + workTime + " ms, legions: " + legionWhUpdated);
177
			log.info("Legion WH update: " + workTime + " ms, legions: " + legionWhUpdated + ".");
178
		}
178
		}
179
	}
179
	}
180
	
180
	
...
...
183
	 */
183
	 */
184
	public void onShutdown()
184
	public void onShutdown()
185
	{
185
	{
186
		log.info("Starting data save on shutdown");
186
		log.info("Starting data save on shutdown.");
187
		legionWhUpdateTask.cancel(false);
187
		legionWhUpdateTask.cancel(false);
188
		new LegionWhUpdateTask().run();
188
		new LegionWhUpdateTask().run();
189
		log.info("Data successfully saved");
189
		log.info("Data successfully saved.");
190
	}
190
	}
191
191
192
}
192
}

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/effect/SummonEffect.java Download diff

15251526
38
	public void applyEffect(Effect effect)
38
	public void applyEffect(Effect effect)
39
	{
39
	{
40
		effect.addToEffectedController();
40
		effect.addToEffectedController();
41
		@SuppressWarnings("unused")
41
		final Player effected = (Player) effect.getEffected();
42
		final Player effected = (Player) effect.getEffected();
42
		//if(!effected.hasSummon())
43
		//if(!effected.hasSummon())
43
		//	effected.addSummon(npcId);
44
		//	effected.addSummon(npcId);