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

Added and extra entry to the output byte array to clarify which data the plugin message was about

Browse Source
This commit is contained in:
Teriuihi 2022-05-09 19:57:06 +02:00
parent 4af754fec5
commit 03a312274f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ public class EventListener {
if (lockSet.contains(lock)) { if (lockSet.contains(lock)) {
//An entry from this server already exists, so we can say that it's locked //An entry from this server already exists, so we can say that it's locked
out.writeBoolean(true); out.writeBoolean(true);
out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
return; return;
} }
@ -113,6 +114,7 @@ public class EventListener {
else { else {
//An entry from another server exists, so we can't lock it //An entry from another server exists, so we can't lock it
out.writeBoolean(false); out.writeBoolean(false);
out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
queueLock(queuedLocks.getOrDefault(identifier, new HashSet<>()), identifier, lock, serverConnection); queueLock(queuedLocks.getOrDefault(identifier, new HashSet<>()), identifier, lock, serverConnection);
return; return;
@ -124,6 +126,7 @@ public class EventListener {
channelLockMap.put(identifier, lockSet); channelLockMap.put(identifier, lockSet);
out.writeBoolean(true); out.writeBoolean(true);
out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
} }
@ -139,6 +142,7 @@ public class EventListener {
else else
out.writeBoolean(false); //The data is not locked out.writeBoolean(false); //The data is not locked
out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
} }
@ -150,6 +154,7 @@ public class EventListener {
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);
out.writeUTF(lock.getData());
lockSet.remove(lock); lockSet.remove(lock);
channelLockMap.put(identifier, lockSet); channelLockMap.put(identifier, lockSet);
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
@ -161,6 +166,7 @@ public class EventListener {
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
{ {
out.writeBoolean(true); out.writeBoolean(true);
out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
queueNextLock(lockSet, lock, identifier); queueNextLock(lockSet, lock, identifier);
return; return;
@ -168,6 +174,7 @@ public class EventListener {
//There is an entry with this data, but it's not owned by this server, so we can't unlock it //There is an entry with this data, but it's not owned by this server, so we can't unlock it
out.writeBoolean(false); out.writeBoolean(false);
out.writeUTF(lock.getData());
serverConnection.sendPluginMessage(identifier, out.toByteArray()); serverConnection.sendPluginMessage(identifier, out.toByteArray());
} }