Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-16 19:51:27 +01:00
Code Issues Projects Releases Wiki Activity

Coop fix

Browse Source
This commit is contained in:
Esophose 2019-06-19 18:51:49 -06:00
parent 1e3ac82c8d
commit 003196c14d
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
#Wed Jun 05 03:45:54 MDT 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

5
src/main/java/me/goodandevil/skyblock/command/commands/island/CoopCommand.java
View File

@ -52,6 +52,11 @@ public class CoopCommand extends SubCommand {
OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]); OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]);
targetPlayerUUID = offlinePlayer.getUniqueId(); targetPlayerUUID = offlinePlayer.getUniqueId();
targetPlayerName = offlinePlayer.getName(); targetPlayerName = offlinePlayer.getName();
if (targetPlayerUUID != null && !Bukkit.getOfflinePlayer(targetPlayerUUID).hasPlayedBefore()) {
targetPlayerUUID = null;
targetPlayerName = null;
}
} else { } else {
targetPlayerUUID = targetPlayer.getUniqueId(); targetPlayerUUID = targetPlayer.getUniqueId();
targetPlayerName = targetPlayer.getName(); targetPlayerName = targetPlayer.getName();

2
src/main/java/me/goodandevil/skyblock/listeners/UltimateStacker.java
View File

@ -49,7 +49,7 @@ public class UltimateStacker implements Listener {
materialAmount = level.getMaterialAmount(materials.name()); 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
} }
} }
}); });

2
src/main/java/me/goodandevil/skyblock/menus/Coop.java
View File

@ -31,6 +31,7 @@ import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEventHandler;
import me.goodandevil.skyblock.utils.player.OfflinePlayer; import me.goodandevil.skyblock.utils.player.OfflinePlayer;
import me.goodandevil.skyblock.utils.version.Materials; import me.goodandevil.skyblock.utils.version.Materials;
import me.goodandevil.skyblock.utils.version.Sounds; import me.goodandevil.skyblock.utils.version.Sounds;
import org.bukkit.scheduler.BukkitRunnable;
public class Coop { public class Coop {
@ -164,6 +165,7 @@ public class Coop {
Island island = islandManager.getIsland(player); Island island = islandManager.getIsland(player);
Set<UUID> coopPlayers = island.getCoopPlayers(); Set<UUID> coopPlayers = island.getCoopPlayers();
coopPlayers.removeIf(x -> !Bukkit.getOfflinePlayer(x).hasPlayedBefore());
int playerMenuPage = playerData.getPage(), nextEndIndex = coopPlayers.size() - playerMenuPage * 36; int playerMenuPage = playerData.getPage(), nextEndIndex = coopPlayers.size() - playerMenuPage * 36;