Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-03 17:17:32 +02:00
Code Issues Projects Releases Wiki Activity

https://github.com/tastybento/bskyblock/issues/161

Browse Source
This commit is contained in:
tastybento 2018-04-23 16:51:18 -07:00
parent 5ebbc2e374
commit 0fe453c163
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/us/tastybento/bskyblock/listeners/JoinLeaveListener.java
View File

@ -2,6 +2,7 @@ package us.tastybento.bskyblock.listeners;
import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
@ -40,6 +41,13 @@ public class JoinLeaveListener implements Listener {
if (plugin.getPlayers().isKnown(playerUUID)) {
// Load player
players.addPlayer(playerUUID);
// Sanity check a few things
for (Location loc : players.getHomeLocations(playerUUID).values()) {
if (!plugin.getIslands().locationIsOnIsland(event.getPlayer(), loc)) {
players.clearHomeLocations(playerUUID);
break;
}
}
// Reset resets if the admin changes it to or from unlimited
if (plugin.getSettings().getResetLimit() < players.getResetsLeft(playerUUID) || (plugin.getSettings().getResetLimit() >= 0 && players.getResetsLeft(playerUUID) < 0)) {
players.setResetsLeft(playerUUID, plugin.getSettings().getResetLimit());

2
src/main/java/us/tastybento/bskyblock/listeners/flags/AbstractFlagListener.java
View File

@ -182,7 +182,7 @@ public abstract class AbstractFlagListener implements Listener {
}
}
// Check if the plugin is set in User (required for testing)
user.setPlugin(plugin);
User.setPlugin(plugin);
if (island.isPresent()) {
if (!island.get().isAllowed(user, flag)) {

2
src/main/java/us/tastybento/bskyblock/managers/IslandsManager.java
View File

@ -689,7 +689,7 @@ public class IslandsManager {
* @return true if on valid island, false if not
*/
public boolean playerIsOnIsland(User user) {
return getIslandAt(user.getLocation()).map(x -> x.onIsland(user.getLocation())).orElse(false);
return Optional.ofNullable(getIsland(user.getUniqueId())).map(i -> i.onIsland(user.getLocation())).orElse(false);
}