Sync with L2JServer Jan 12th 2015.

2015-01-13 09:50:20 +00:00
parent a868d961a3
commit 0a44ad683c
1158 changed files with 59729 additions and 58627 deletions
--- a/trunk/java/com/l2jserver/gameserver/instancemanager/ClanEntryManager.java
+++ b/trunk/java/com/l2jserver/gameserver/instancemanager/ClanEntryManager.java
@ -382,7 +382,7 @@ public class ClanEntryManager
 	
 	public long getClanLockTime(int playerId)
 	{
-		return _clanLocked.get(playerId) == null ? 0 : _playerLocked.get(playerId).getDelay(TimeUnit.MINUTES);
+		return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES);
 	}
 	
 	private static void lockPlayer(int playerId)