Altitude/DataLock
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a lock from the lockQueue if a server requests that specific lock to be removed from the active locks

Browse Source
This commit is contained in:
Teriuihi 2022-05-15 20:44:34 +02:00
parent 799a7ead9d
commit 780249933c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/alttd/datalock/EventListener.java
View File

@ -147,10 +147,11 @@ public class EventListener {
} }
private void tryUnlock(ChannelIdentifier identifier, HashSet<Lock> lockSet, String data, ServerConnection serverConnection) { private void tryUnlock(ChannelIdentifier identifier, HashSet<Lock> lockSet, String data, ServerConnection serverConnection) {
int hash = serverConnection.getServerInfo().hashCode();
ByteArrayDataOutput out = ByteStreams.newDataOutput(); ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("try-unlock-result"); out.writeUTF("try-unlock-result");
Lock lock = new Lock(serverConnection.getServerInfo().hashCode(), data); Lock lock = new Lock(hash, data);
if (lockSet.contains(lock)) //Lock is in the list, but it's made by this server, so we can unlock it if (lockSet.contains(lock)) //Lock is in the list, but it's made by this server, so we can unlock it
{ {
out.writeBoolean(true); out.writeBoolean(true);
@ -165,6 +166,7 @@ public class EventListener {
Optional<Lock> first = lockSet.stream().filter(a -> a.compareTo(lock) == 0).findFirst(); Optional<Lock> first = lockSet.stream().filter(a -> a.compareTo(lock) == 0).findFirst();
if (first.isEmpty()) //There is no entry with this data, so we can say it's unlocked if (first.isEmpty()) //There is no entry with this data, so we can say it's unlocked
{ {
removeQueuedLock(queuedLocks.get(identifier), lock, hash);
out.writeBoolean(true); out.writeBoolean(true);
out.writeUTF(lock.getData()); out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
@ -178,6 +180,17 @@ public class EventListener {
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
} }
private void removeQueuedLock(HashSet<Lock> locks, Lock exampleLock, int hash) {
if (locks == null)
return;
Optional<Lock> other = locks.stream().filter(a -> a.compareTo(exampleLock) == 0).findFirst();
if (other.isEmpty())
return;
Lock lock = other.get();
if (lock.getServerHash() == hash)
locks.remove(lock);
}
private void queueLock(HashSet<Lock> lockSet, ChannelIdentifier identifier, Lock lock, ServerConnection serverConnection) { private void queueLock(HashSet<Lock> lockSet, ChannelIdentifier identifier, Lock lock, ServerConnection serverConnection) {
if (lockSet.contains(lock)) { if (lockSet.contains(lock)) {
//Lock already queued we don't have to queue it again //Lock already queued we don't have to queue it again