diff --git a/.gradle/7.1/executionHistory/executionHistory.bin b/.gradle/7.1/executionHistory/executionHistory.bin index 30658c10e..1ca32958a 100644 Binary files a/.gradle/7.1/executionHistory/executionHistory.bin and b/.gradle/7.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.1/executionHistory/executionHistory.lock b/.gradle/7.1/executionHistory/executionHistory.lock index 0a854ac26..f53073165 100644 Binary files a/.gradle/7.1/executionHistory/executionHistory.lock and b/.gradle/7.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.1/fileHashes/fileHashes.bin b/.gradle/7.1/fileHashes/fileHashes.bin index 96f4ff977..38efa61c1 100644 Binary files a/.gradle/7.1/fileHashes/fileHashes.bin and b/.gradle/7.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock index d74f52afc..354fe259e 100644 Binary files a/.gradle/7.1/fileHashes/fileHashes.lock and b/.gradle/7.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1/fileHashes/resourceHashesCache.bin index 8fba3c899..0d4ee1ff6 100644 Binary files a/.gradle/7.1/fileHashes/resourceHashesCache.bin and b/.gradle/7.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1f15cbb38..015197984 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 0ed69af01..071a3d2a0 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index e1016f1e9..7ac63c9cd 100644 Binary files a/.gradle/checksums/checksums.lock and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin index 7fb2e2a99..c5127c51e 100644 Binary files a/.gradle/checksums/md5-checksums.bin and b/.gradle/checksums/md5-checksums.bin differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin index 41660357e..8a17a4576 100644 Binary files a/.gradle/checksums/sha1-checksums.bin and b/.gradle/checksums/sha1-checksums.bin differ diff --git a/.idea/codestream.xml b/.idea/codestream.xml index f5d6a836b..e66441c54 100644 --- a/.idea/codestream.xml +++ b/.idea/codestream.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class b/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class index 57fbbf7d0..3f107d83f 100644 Binary files a/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class and b/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class differ 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 index f0dacaa5f..b9fb06edd 100644 Binary files a/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/ranks/Rank.class and b/commons/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/ranks/Rank.class differ diff --git a/commons/build/kotlin/compileKotlin/build-history.bin b/commons/build/kotlin/compileKotlin/build-history.bin index bfe220db2..995c9a076 100644 Binary files a/commons/build/kotlin/compileKotlin/build-history.bin and b/commons/build/kotlin/compileKotlin/build-history.bin differ 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 index e7179c43a..e2253b354 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab differ 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 index 1f885e2df..c3745690a 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at differ 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 index b7da0642a..dd2b676bf 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab differ 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 index 8ea3d1a96..fe3f8aeba 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ 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 index 03e4e1ed8..20390ed2c 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at index 24814614a..aff50df03 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ 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 index 020303e07..1e0e4d9e6 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at index 2e88472f1..ce21f6e38 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab index 52d203a67..ad68b0f1f 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab differ 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 index 815d41c0d..9b94e3680 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at differ 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 index ef2f7468d..47c26f8fe 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab differ 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 index 96ba62a4a..128ea1e49 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab index 2dce5b8e9..d4e46c70c 100644 --- 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 \ No newline at end of file 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 index d5831e1aa..4154c32fa 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab differ 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 index 632ffbed3..0279d6187 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at differ 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 index 39f73a7ce..7dbdea2f6 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab differ 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 index eee417c18..a9e758f0f 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream differ 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 index 4b05c5561..11d24d584 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len differ 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 index 1b7c1f8b1..8e9520632 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len differ 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 index a78049fa7..47b634cad 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at differ 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 index 3056823eb..5bf5acb5b 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab index 89ce2c924..adbbeb13d 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream index 32806837b..95ad731f3 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream differ 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 index 47215bc84..ea0cadc62 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len index 071f94d7c..72f73ce88 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len differ 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 index f9ff78e72..8116ceacd 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at differ diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i index 5a028855d..a87b2f781 100644 Binary files a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i and b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i differ diff --git a/commons/build/kotlin/compileKotlin/last-build.bin b/commons/build/kotlin/compileKotlin/last-build.bin index e524d4fbd..d49eb8dcf 100644 Binary files a/commons/build/kotlin/compileKotlin/last-build.bin and b/commons/build/kotlin/compileKotlin/last-build.bin differ diff --git a/commons/build/libs/commons-1.0-SNAPSHOT.jar b/commons/build/libs/commons-1.0-SNAPSHOT.jar index c81537759..573788ac0 100644 Binary files a/commons/build/libs/commons-1.0-SNAPSHOT.jar and b/commons/build/libs/commons-1.0-SNAPSHOT.jar differ diff --git a/commons/build/tmp/kapt3/incApCache/main/apt-cache.bin b/commons/build/tmp/kapt3/incApCache/main/apt-cache.bin index 3b5cdf28f..27d7e2915 100644 Binary files a/commons/build/tmp/kapt3/incApCache/main/apt-cache.bin and b/commons/build/tmp/kapt3/incApCache/main/apt-cache.bin differ diff --git a/commons/build/tmp/kapt3/incApCache/main/java-cache.bin b/commons/build/tmp/kapt3/incApCache/main/java-cache.bin index 665f1a127..002136a9c 100644 Binary files a/commons/build/tmp/kapt3/incApCache/main/java-cache.bin and b/commons/build/tmp/kapt3/incApCache/main/java-cache.bin differ diff --git a/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.kapt_metadata b/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.kapt_metadata index c01bc0a12..961fcfa41 100644 Binary files a/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.kapt_metadata and b/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.kapt_metadata differ diff --git a/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/ranks/Rank.kapt_metadata b/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/ranks/Rank.kapt_metadata index 0c9c4a015..e729b59b9 100644 Binary files a/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/ranks/Rank.kapt_metadata and b/commons/build/tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/models/ranks/Rank.kapt_metadata differ 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 index 2b244d109..b1e42a5d4 100644 --- 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 index b2c22e3c5..b6db10df4 100644 --- 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/spigot/build/classes/kotlin/main/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.class b/spigot/build/classes/kotlin/main/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.class index f7b96978d..29f415aa5 100644 Binary files a/spigot/build/classes/kotlin/main/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.class and b/spigot/build/classes/kotlin/main/ltd/matrixstudios/alchemist/listeners/profile/ProfileJoinListener.class differ diff --git a/spigot/build/kotlin/compileKotlin/build-history.bin b/spigot/build/kotlin/compileKotlin/build-history.bin index fee2bd990..6510efe4c 100644 Binary files a/spigot/build/kotlin/compileKotlin/build-history.bin and b/spigot/build/kotlin/compileKotlin/build-history.bin differ 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 index 97c8c300f..cc03a4c28 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab differ 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 index ec4948134..e3cea2830 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at differ 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 index 5b2b35e54..267b9ff08 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab differ 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 index 3d212a615..00d86cc90 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ 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 index dd0d7043c..f1bc52c34 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at index 6e32cffc1..db8b32827 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ 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 index 835b4eb48..620a43f3e 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at index dcafac749..e40c1e9db 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab index 89781b588..963ab292b 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab differ 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 index 986fabe12..2430ce9d3 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at differ 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 index 2c4e7105a..6971960b6 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab differ 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 index 08bd6fc78..828028407 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab index 8698d0bf8..860dde71a 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab differ 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 index 94d19d41d..58f505c9a 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab index 77a2ab9d4..c66c4a3ed 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab differ 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 index 3ffeda2f8..8007b10a4 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab index dac8e497c..9a9fefe3c 100644 --- 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 \ No newline at end of file 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 index 557030c2c..2ba7fbb31 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab differ 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 index b4ff5917a..09037024e 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at differ 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 index 41cc11441..19fc0529a 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab differ 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 index 48c7c30ef..496bdde9b 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream differ 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 index 01bdaa1da..5024611e4 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len differ 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 index 4e3f8d310..f2779a8dd 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len differ 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 index 56dc0be51..754d6f3b4 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at differ 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 index 9c754cd9b..0dd242298 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab index 8f7e3045b..18d94a2eb 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream index 1919af0f8..2ce5b041b 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream differ 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 index 0e95b48e9..38039688a 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len index f68b80caa..5af0258b2 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len differ diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values index 8a6c8789a..326046d62 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values differ 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 index 8beb9a686..343e42c89 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at differ 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 index 1f747de49..abab6490a 100644 --- 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 \ No newline at end of file +ùŽÊ9éq×ÔÕÂö½ý½ÙÀ \ No newline at end of file diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i index 90476e343..ee81d01c6 100644 Binary files a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i and b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i differ diff --git a/spigot/build/kotlin/compileKotlin/last-build.bin b/spigot/build/kotlin/compileKotlin/last-build.bin index aabfd66c9..641677e03 100644 Binary files a/spigot/build/kotlin/compileKotlin/last-build.bin and b/spigot/build/kotlin/compileKotlin/last-build.bin differ diff --git a/spigot/build/tmp/kapt3/incApCache/main/apt-cache.bin b/spigot/build/tmp/kapt3/incApCache/main/apt-cache.bin index 3b5cdf28f..27d7e2915 100644 Binary files a/spigot/build/tmp/kapt3/incApCache/main/apt-cache.bin and b/spigot/build/tmp/kapt3/incApCache/main/apt-cache.bin differ diff --git a/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin b/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin index 358d07e9d..a1621bc42 100644 Binary files a/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin and b/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin differ diff --git a/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin b/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin index a993e1aee..8e22debc0 100644 Binary files a/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin and b/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin differ 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 index d3a4e9e24..b7eb6fe77 100644 --- 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) } }