lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed player reentrant locks.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-30 19:03:16 +00:00
parent cdab936ea5
commit dff067c91e
51 changed files with 907 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -40,7 +40,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import java.util.stream.Collectors;
@ -426,7 +425,7 @@ public class PlayerInstance extends Playable
private long _lastAccess;
private long _uptime;
private final ReentrantLock _subclassLock = new ReentrantLock();
private boolean _subclassLock = false;
protected int _baseClass;
protected int _activeClass;
protected int _classIndex = 0;
@ -706,8 +705,6 @@ public class PlayerInstance extends Playable
private BroochJewel _activeRubyJewel = null;
private BroochJewel _activeShappireJewel = null;
public ReentrantLock soulShotLock = new ReentrantLock();
/** Event parameters */
private PlayerEventHolder eventStatus = null;
@ -2335,10 +2332,11 @@ public class PlayerInstance extends Playable
*/
public void setClassId(int id)
{
if (!_subclassLock.tryLock())
if (_subclassLock)
{
return;
}
_subclassLock = true;
try
{
@ -2419,7 +2417,7 @@ public class PlayerInstance extends Playable
}
finally
{
_subclassLock.unlock();
_subclassLock = false;
}
}
@ -9414,10 +9412,11 @@ public class PlayerInstance extends Playable
*/
public boolean addSubClass(int classId, int classIndex, boolean isDualClass)
{
if (!_subclassLock.tryLock())
if (_subclassLock)
{
return false;
}
_subclassLock = true;
try
{
@ -9489,7 +9488,7 @@ public class PlayerInstance extends Playable
}
finally
{
_subclassLock.unlock();
_subclassLock = false;
}
}
@ -9504,10 +9503,11 @@ public class PlayerInstance extends Playable
*/
public boolean modifySubClass(int classIndex, int newClassId, boolean isDualClass)
{
if (!_subclassLock.tryLock())
if (_subclassLock)
{
return false;
}
_subclassLock = true;
try
{
@ -9583,7 +9583,7 @@ public class PlayerInstance extends Playable
}
finally
{
_subclassLock.unlock();
_subclassLock = false;
}
return addSubClass(newClassId, classIndex, isDualClass);
@ -9690,10 +9690,11 @@ public class PlayerInstance extends Playable
*/
public void setActiveClass(int classIndex)
{
if (!_subclassLock.tryLock())
if (_subclassLock)
{
return;
}
_subclassLock = true;
try
{
@ -9837,13 +9838,13 @@ public class PlayerInstance extends Playable
}
finally
{
_subclassLock.unlock();
_subclassLock = false;
}
}
public boolean isSubclassLocked()
{
return _subclassLock.isLocked();
return _subclassLock;
}
public void stopWarnUserTakeBreak()