diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 44e7c4d1..ed8973d9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Jun 05 03:45:54 MDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip diff --git a/src/main/java/me/goodandevil/skyblock/command/commands/island/CoopCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/island/CoopCommand.java index bc0fa9f9..9a82ec3a 100644 --- a/src/main/java/me/goodandevil/skyblock/command/commands/island/CoopCommand.java +++ b/src/main/java/me/goodandevil/skyblock/command/commands/island/CoopCommand.java @@ -52,6 +52,11 @@ public class CoopCommand extends SubCommand { OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]); targetPlayerUUID = offlinePlayer.getUniqueId(); targetPlayerName = offlinePlayer.getName(); + + if (targetPlayerUUID != null && !Bukkit.getOfflinePlayer(targetPlayerUUID).hasPlayedBefore()) { + targetPlayerUUID = null; + targetPlayerName = null; + } } else { targetPlayerUUID = targetPlayer.getUniqueId(); targetPlayerName = targetPlayer.getName(); diff --git a/src/main/java/me/goodandevil/skyblock/listeners/UltimateStacker.java b/src/main/java/me/goodandevil/skyblock/listeners/UltimateStacker.java index 89148b9b..523612f9 100644 --- a/src/main/java/me/goodandevil/skyblock/listeners/UltimateStacker.java +++ b/src/main/java/me/goodandevil/skyblock/listeners/UltimateStacker.java @@ -49,7 +49,7 @@ public class UltimateStacker implements Listener { materialAmount = level.getMaterialAmount(materials.name()); } - level.setMaterialAmount(materials.name(), materialAmount + event.getAmount()); + level.setMaterialAmount(materials.name(), materialAmount + event.getAmount() - 1); // Normal place event still goes off } } }); diff --git a/src/main/java/me/goodandevil/skyblock/menus/Coop.java b/src/main/java/me/goodandevil/skyblock/menus/Coop.java index 8f58c0aa..df97460e 100644 --- a/src/main/java/me/goodandevil/skyblock/menus/Coop.java +++ b/src/main/java/me/goodandevil/skyblock/menus/Coop.java @@ -31,6 +31,7 @@ import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEventHandler; import me.goodandevil.skyblock.utils.player.OfflinePlayer; import me.goodandevil.skyblock.utils.version.Materials; import me.goodandevil.skyblock.utils.version.Sounds; +import org.bukkit.scheduler.BukkitRunnable; public class Coop { @@ -164,6 +165,7 @@ public class Coop { Island island = islandManager.getIsland(player); Set coopPlayers = island.getCoopPlayers(); + coopPlayers.removeIf(x -> !Bukkit.getOfflinePlayer(x).hasPlayedBefore()); int playerMenuPage = playerData.getPage(), nextEndIndex = coopPlayers.size() - playerMenuPage * 36;