Merge remote-tracking branch 'origin/develop'

BentoBoxWorld · Sep 26, 2021 · 506bf58 · 506bf58
2 parents 15c6e15 + 807bca5
commit 506bf58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,14 +59,14 @@
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.13.0-SNAPSHOT</bentobox.version>
+        <bentobox.version>1.17.1-SNAPSHOT</bentobox.version>
         <level.version>1.5.0</level.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.0.2</build.version>
+        <build.version>1.0.3</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
@@ -109,30 +109,6 @@
                 <build.number></build.number>
             </properties>
         </profile>
-        <profile>
-            <id>sonar</id>
-            <properties>
-                <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-                <sonar.organization>bentobox-world</sonar.organization>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.sonarsource.scanner.maven</groupId>
-                        <artifactId>sonar-maven-plugin</artifactId>
-                        <version>3.6.0.1398</version>
-                        <executions>
-                            <execution>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sonar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <repositories>

diff --git a/src/main/java/world/bentobox/checkmeout/SubmissionsManager.java b/src/main/java/world/bentobox/checkmeout/SubmissionsManager.java
@@ -73,6 +73,7 @@ public SubmissionsManager(CheckMeOut addon, BentoBox plugin) {
      * @return true if successful, false if not
      */
     public boolean addSubmission(final UUID playerUUID, final Location loc) {
+        BentoBox.getInstance().logDebug("add ing submittion " + playerUUID + " " + loc);
         // Do not allow null players to set submissions
         if (playerUUID == null || loc == null) {
             return false;
@@ -176,7 +177,7 @@ public void removeSubmission(World world, UUID uuid) {
      */
     public void saveSubmissions() {
         submissionsData.setSubmissions(worldsSubmissionsList);
-        handler.saveObject(submissionsData);
+        handler.saveObjectAsync(submissionsData);
     }
 
     /**

diff --git a/src/main/java/world/bentobox/checkmeout/commands/CheckMeOutCommand.java b/src/main/java/world/bentobox/checkmeout/commands/CheckMeOutCommand.java
@@ -41,10 +41,12 @@ public boolean canExecute(User user, String label, List<String> args) {
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        if (((CheckMeOut)getAddon()).getSubmissionsManager().addSubmission(user.getUniqueId(), getPlayers().getHomeLocation(getWorld(), user.getUniqueId()))) {
+        if (((CheckMeOut)getAddon()).getSubmissionsManager().addSubmission(user.getUniqueId(), getIslands().getHomeLocation(getWorld(), user.getUniqueId()))) {
             user.sendMessage("general.success");
             return true;
         }
+        user.sendMessage("general.errors.general");
+        getAddon().logError("Could not submit island");
         return false;
     }