fix permissions

98ping · Dec 26, 2022 · eff2211 · eff2211
1 parent dbeca4a
commit eff2211
Show file tree

Hide file tree

Showing 89 changed files with 26 additions and 17 deletions.
diff --git a/.gradle/7.1/executionHistory/executionHistory.bin b/.gradle/7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.1/executionHistory/executionHistory.lock b/.gradle/7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.1/fileHashes/fileHashes.bin b/.gradle/7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.idea/codestream.xml b/.idea/codestream.xml
diff --git a/...ns/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class b/...ns/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class
diff --git a/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/ranks/Rank.class b/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/ranks/Rank.class
diff --git a/commons/build/kotlin/compileKotlin/build-history.bin b/commons/build/kotlin/compileKotlin/build-history.bin
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-34
+39
 0
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/commons/build/kotlin/compileKotlin/last-build.bin b/commons/build/kotlin/compileKotlin/last-build.bin
diff --git a/commons/build/libs/commons-1.0-SNAPSHOT.jar b/commons/build/libs/commons-1.0-SNAPSHOT.jar
diff --git a/commons/build/tmp/kapt3/incApCache/main/apt-cache.bin b/commons/build/tmp/kapt3/incApCache/main/apt-cache.bin
diff --git a/commons/build/tmp/kapt3/incApCache/main/java-cache.bin b/commons/build/tmp/kapt3/incApCache/main/java-cache.bin
diff --git a/...tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.kapt_metadata b/...tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.kapt_metadata
diff --git a/...ns/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/ranks/Rank.kapt_metadata b/...ns/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/ranks/Rank.kapt_metadata
diff --git a/commons/src/main/kotlin/ltd/matrixstudios/alchemist/models/profile/GameProfile.kt b/commons/src/main/kotlin/ltd/matrixstudios/alchemist/models/profile/GameProfile.kt
@@ -150,14 +150,17 @@ data class GameProfile(
 
         val parents = getCurrentRank()!!.parents.map {
             RankService.byId(it)
-        }.filter {
-            Objects.nonNull(it)
         }
 
         parents.forEach { rank ->
-            rank!!.permissions.forEach {
-                if (!allPerms.contains(it)) {
-                    allPerms.add(it)
+            if (rank != null)
+            {
+                for (perm in rank.permissions)
+                {
+                    if (!allPerms.contains(perm))
+                    {
+                        allPerms.add(perm)
+                    }
                 }
             }
         }

diff --git a/commons/src/main/kotlin/ltd/matrixstudios/alchemist/models/ranks/Rank.kt b/commons/src/main/kotlin/ltd/matrixstudios/alchemist/models/ranks/Rank.kt
@@ -1,5 +1,7 @@
 package ltd.matrixstudios.alchemist.models.ranks
 
+import ltd.matrixstudios.alchemist.service.ranks.RankService
+import sun.security.ec.point.ProjectivePoint.Mutable
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -18,4 +20,5 @@ class Rank(
     var staff: Boolean = false,
     var default: Boolean = false
 ) {
+
 }
diff --git a/...asses/kotlin/main/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.class b/...asses/kotlin/main/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.class
diff --git a/spigot/build/kotlin/compileKotlin/build-history.bin b/spigot/build/kotlin/compileKotlin/build-history.bin
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-144
+149
 0
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-���9�q
+���9�q����������
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/last-build.bin b/spigot/build/kotlin/compileKotlin/last-build.bin
diff --git a/spigot/build/tmp/kapt3/incApCache/main/apt-cache.bin b/spigot/build/tmp/kapt3/incApCache/main/apt-cache.bin
diff --git a/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin b/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin
diff --git a/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin b/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin
diff --git a/spigot/src/main/kotlin/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.kt b/spigot/src/main/kotlin/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.kt
@@ -17,6 +17,7 @@ import org.bukkit.event.Listener
 import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent
 import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
 import java.util.*
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
@@ -62,14 +63,9 @@ class ProfileJoinListener : Listener {
     @EventHandler
     fun applyPerms(event: PlayerJoinEvent) {
         val player = event.player
+        val profile = ProfileGameService.byId(player.uniqueId) ?: return
 
-        val perms = AccessiblePermissionHandler.pendingLoadPermissions.getOrDefault(player.uniqueId, mapOf())
-
-        CompletableFuture.runAsync {
-            AccessiblePermissionHandler.update(player, perms)
-        }
-
-        AccessiblePermissionHandler.pendingLoadPermissions.remove(player.uniqueId)
+        AccessiblePermissionHandler.update(player, profile.getPermissions())
     }
 
     @EventHandler
@@ -107,7 +103,14 @@ class ProfileJoinListener : Listener {
         //doing this for syncing purposes and because the network manager needs to track when they were last on
         ProfileGameService.handler.storeAsync(profile.uuid, profile)
 
-        AccessiblePermissionHandler.setupPlayer(event.uniqueId, profile.getPermissions())
+    }
+
+    @EventHandler
+    fun leave(event: PlayerQuitEvent)
+    {
+        val player = event.player
+
+        AccessiblePermissionHandler.remove(player)
 
     }
 }