Removed player reentrant locks.
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -429,7 +428,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;
|
||||
@@ -711,8 +710,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;
|
||||
|
||||
@@ -2359,10 +2356,11 @@ public class PlayerInstance extends Playable
|
||||
*/
|
||||
public void setClassId(int id)
|
||||
{
|
||||
if (!_subclassLock.tryLock())
|
||||
if (_subclassLock)
|
||||
{
|
||||
return;
|
||||
}
|
||||
_subclassLock = true;
|
||||
|
||||
try
|
||||
{
|
||||
@@ -2443,7 +2441,7 @@ public class PlayerInstance extends Playable
|
||||
}
|
||||
finally
|
||||
{
|
||||
_subclassLock.unlock();
|
||||
_subclassLock = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9461,10 +9459,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
|
||||
{
|
||||
@@ -9536,7 +9535,7 @@ public class PlayerInstance extends Playable
|
||||
}
|
||||
finally
|
||||
{
|
||||
_subclassLock.unlock();
|
||||
_subclassLock = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9551,10 +9550,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
|
||||
{
|
||||
@@ -9630,7 +9630,7 @@ public class PlayerInstance extends Playable
|
||||
}
|
||||
finally
|
||||
{
|
||||
_subclassLock.unlock();
|
||||
_subclassLock = false;
|
||||
}
|
||||
|
||||
return addSubClass(newClassId, classIndex, isDualClass);
|
||||
@@ -9737,10 +9737,11 @@ public class PlayerInstance extends Playable
|
||||
*/
|
||||
public void setActiveClass(int classIndex)
|
||||
{
|
||||
if (!_subclassLock.tryLock())
|
||||
if (_subclassLock)
|
||||
{
|
||||
return;
|
||||
}
|
||||
_subclassLock = true;
|
||||
|
||||
try
|
||||
{
|
||||
@@ -9884,13 +9885,13 @@ public class PlayerInstance extends Playable
|
||||
}
|
||||
finally
|
||||
{
|
||||
_subclassLock.unlock();
|
||||
_subclassLock = false;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isSubclassLocked()
|
||||
{
|
||||
return _subclassLock.isLocked();
|
||||
return _subclassLock;
|
||||
}
|
||||
|
||||
public void stopWarnUserTakeBreak()
|
||||
|
Reference in New Issue
Block a user