Merge branch 'develop'

Author: nafu-at

build.gradle

@@ -3,11 +3,11 @@ import org.apache.tools.ant.filters.ReplaceTokens
 plugins {
     id 'java'
     id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '7.1.0'
 }
 
 group = 'page.nafuchoco'
-version = '4.5.2'
+version = '4.6.0'
 
 java {
     toolchain {
@@ -70,22 +70,22 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.jetbrains:annotations:21.0.1'
-    compileOnly 'org.projectlombok:lombok:1.18.20'
-    annotationProcessor 'org.projectlombok:lombok:1.18.20'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.projectlombok:lombok:1.18.22'
+    annotationProcessor 'org.projectlombok:lombok:1.18.22'
 
     compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
     compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.2'
     compileOnly 'net.coreprotect:coreprotect:20.0'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.0'
 
-    implementation 'com.google.code.gson:gson:2.8.7'
+    implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     implementation 'team.aura_dev.lib.slf4j-plugin.spigot:slf4j-plugin-spigot:1.2.0.39:1.7.25'
     implementation 'com.zaxxer:HikariCP:5.0.0'
-    implementation 'mysql:mysql-connector-java:8.0.25'
-    implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
+    implementation 'mysql:mysql-connector-java:8.0.26'
+    implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
 }
 
 processResources {

src/main/java/page/nafuchoco/soloservercore/SoloServerCore.java

@@ -285,7 +285,19 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             sender.sendMessage(ChatColor.RED + "You can't run this command because you don't have permission.");
         } else switch (command.getName()) {
             case "status":
-                sender.sendMessage("Remaining spawn points: " + spawnPointLoader.getPointRemaining());
+                sender.sendMessage(ChatColor.AQUA + "======== SoloServerCore System Information ========");
+                sender.sendMessage("Plugin Version: " + getDescription().getVersion());
+                sender.sendMessage("Stocked spawn point: " + spawnPointLoader.getPointRemaining());
+                sender.sendMessage("");
+                sender.sendMessage("CHECK_BLOCK: " + pluginSettingsManager.isCheckBlock());
+                sender.sendMessage("PROTECTION_PERIOD: " + pluginSettingsManager.getProtectionPeriod());
+                sender.sendMessage("TEAM_SPAWN_COLLECT: " + pluginSettingsManager.isTeamSpawnCollect());
+                sender.sendMessage("STOCK_SPAWN_POINT: " + pluginSettingsManager.getStockSpawnPoint());
+                sender.sendMessage("BROADCAST_BED_COUNT: " + pluginSettingsManager.isBroadcastBedCount());
+                sender.sendMessage("USE_AFK_COUNT: " + pluginSettingsManager.isUseAfkCount());
+                sender.sendMessage("AFK_TIME_THRESHOLD: " + pluginSettingsManager.getAfkTimeThreshold());
+                sender.sendMessage("RETELEPORT_RESET_ALL: " + pluginSettingsManager.isReteleportResetAll());
+                sender.sendMessage("LAST_MIGRATED_VERSION: " + pluginSettingsManager.getLastMigratedVersion());
                 break;
 
             case "charge":

src/main/java/page/nafuchoco/soloservercore/listener/BlockEventListener.java

@@ -64,29 +64,32 @@ public void onBlockPlaceEvent(BlockPlaceEvent event) {
 
     private boolean checkEditRights(Block block, Player player) {
         // Permission Check
-        if (!player.hasPermission("soloservercore.protect.bypass")) {
-            String actionPlayer = coreProtect.getAction(block, settingsManager.getProtectionPeriod());
-            // Action Player Check
-            if (actionPlayer != null && !actionPlayer.startsWith("#") && !player.getName().equals(actionPlayer)) {
-                val sscPlayer = SoloServerApi.getInstance().getSSCPlayer(player);
-                if (sscPlayer.getJoinedTeam() != null) {
-                    val joinedTeam = sscPlayer.getJoinedTeam();
-                    val members = new ArrayList<UUID>();
-                    members.addAll(joinedTeam.getMembers());
-                    members.add(joinedTeam.getOwner());
-                    // Action Team Member Check
-                    for (val uuid : members) {
-                        val member = Bukkit.getOfflinePlayer(uuid).getName();
-                        if (member.equals(actionPlayer))
-                            return true;
+        if (block.getWorld().equals(SoloServerApi.getInstance().getSSCPlayer(player).getSpawnLocationObject().getWorld())) {
+            if (!player.hasPermission("soloservercore.protect.bypass")) {
+                String actionPlayer = coreProtect.getAction(block, settingsManager.getProtectionPeriod());
+                // Action Player Check
+                if (actionPlayer != null && !actionPlayer.startsWith("#") && !player.getName().equals(actionPlayer)) {
+                    val sscPlayer = SoloServerApi.getInstance().getSSCPlayer(player);
+                    if (sscPlayer.getJoinedTeam() != null) {
+                        val joinedTeam = sscPlayer.getJoinedTeam();
+                        val members = new ArrayList<UUID>();
+                        members.addAll(joinedTeam.getMembers());
+                        members.add(joinedTeam.getOwner());
+                        // Action Team Member Check
+                        for (val uuid : members) {
+                            val member = Bukkit.getOfflinePlayer(uuid).getName();
+                            if (member.equals(actionPlayer))
+                                return true;
+                        }
                     }
+                } else {
+                    return true;
                 }
+                return false;
             } else {
                 return true;
             }
-            return false;
-        } else {
-            return true;
         }
+        return true;
     }
 }