Browse Source

BETA: Fixing one more deadlock in increase/decrease charges (We got AtomicInteger sync block is not needed)
* Reported by: nBd

Rumen Nikiforov 12 years ago
parent
commit
7511298168

+ 2 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -14671,7 +14671,7 @@ public final class L2PcInstance extends L2Playable
 		return _charges.get();
 		return _charges.get();
 	}
 	}
 	
 	
-	public synchronized void increaseCharges(int count, int max)
+	public void increaseCharges(int count, int max)
 	{
 	{
 		if (_charges.get() >= max)
 		if (_charges.get() >= max)
 		{
 		{
@@ -14697,7 +14697,7 @@ public final class L2PcInstance extends L2Playable
 		sendPacket(new EtcStatusUpdate(this));
 		sendPacket(new EtcStatusUpdate(this));
 	}
 	}
 	
 	
-	public synchronized boolean decreaseCharges(int count)
+	public boolean decreaseCharges(int count)
 	{
 	{
 		if (_charges.get() < count)
 		if (_charges.get() < count)
 		{
 		{
@@ -14745,7 +14745,6 @@ public final class L2PcInstance extends L2Playable
 		if (_chargeTask != null)
 		if (_chargeTask != null)
 		{
 		{
 			_chargeTask.cancel(false);
 			_chargeTask.cancel(false);
-			// ThreadPoolManager.getInstance().removeGeneral((Runnable)_chargeTask);
 			_chargeTask = null;
 			_chargeTask = null;
 		}
 		}
 	}
 	}