Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-22 18:55:17 +01:00
Code Issues Projects Releases Wiki Activity

Simplified some logic.

Browse Source
This commit is contained in:
tastybento 2018-02-06 13:35:17 -08:00
parent f7c4e5a988
commit 84d36a1a24
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/us/tastybento/bskyblock/database/managers/island/IslandsManager.java
View File

@ -73,19 +73,19 @@ public class IslandsManager {
return false; return false;
} }
// In BSkyBlock, liquid may be unsafe // In BSkyBlock, liquid may be unsafe
if (ground.isLiquid() || space1.isLiquid() || space2.isLiquid()) { // Check if acid has no damage
// Check if acid has no damage if (plugin.getSettings().getAcidDamage() > 0D && (ground.isLiquid() || space1.isLiquid() || space2.isLiquid())) {
if (plugin.getSettings().getAcidDamage() > 0D) { // Bukkit.getLogger().info("DEBUG: acid");
// Bukkit.getLogger().info("DEBUG: acid"); return false;
return false;
} else if (ground.getType().equals(Material.STATIONARY_LAVA) || ground.getType().equals(Material.LAVA)
|| space1.getType().equals(Material.STATIONARY_LAVA) || space1.getType().equals(Material.LAVA)
|| space2.getType().equals(Material.STATIONARY_LAVA) || space2.getType().equals(Material.LAVA)) {
// Lava check only
// Bukkit.getLogger().info("DEBUG: lava");
return false;
}
} }
if (ground.getType().equals(Material.STATIONARY_LAVA) || ground.getType().equals(Material.LAVA)
|| space1.getType().equals(Material.STATIONARY_LAVA) || space1.getType().equals(Material.LAVA)
|| space2.getType().equals(Material.STATIONARY_LAVA) || space2.getType().equals(Material.LAVA)) {
// Lava check only
// Bukkit.getLogger().info("DEBUG: lava");
return false;
}
MaterialData md = ground.getState().getData(); MaterialData md = ground.getState().getData();
if (md instanceof SimpleAttachableMaterialData) { if (md instanceof SimpleAttachableMaterialData) {
//Bukkit.getLogger().info("DEBUG: trapdoor/button/tripwire hook etc."); //Bukkit.getLogger().info("DEBUG: trapdoor/button/tripwire hook etc.");
@ -160,7 +160,7 @@ public class IslandsManager {
height = i; height = i;
depth = i; depth = i;
} else { } else {
Optional<Island> island = getIslandAt(l); Optional<Island> island = getIslandAt(l);
if (!island.isPresent()) { if (!island.isPresent()) {
return null; return null;
@ -649,7 +649,7 @@ public class IslandsManager {
location = getClosestIsland(location); location = getClosestIsland(location);
if (islandCache.contains(location)) if (islandCache.contains(location))
return true; return true;
if (!plugin.getSettings().isUseOwnGenerator()) { if (!plugin.getSettings().isUseOwnGenerator()) {
// Block check // Block check
if (!location.getBlock().isEmpty() && !location.getBlock().isLiquid()) { if (!location.getBlock().isEmpty() && !location.getBlock().isLiquid()) {
@ -689,7 +689,7 @@ public class IslandsManager {
long y = plugin.getSettings().getIslandHeight(); long y = plugin.getSettings().getIslandHeight();
return new Location(location.getWorld(), x, y, z); return new Location(location.getWorld(), x, y, z);
} }
/** /**
* @param uniqueId * @param uniqueId
* @return true if the player is the owner of their island, i.e., owner or team leader * @return true if the player is the owner of their island, i.e., owner or team leader
@ -863,7 +863,7 @@ public class IslandsManager {
public boolean playerIsOnIsland(User user, boolean coop) { public boolean playerIsOnIsland(User user, boolean coop) {
return locationIsAtHome(user.getUniqueId(), coop, user.getLocation()); return locationIsAtHome(user.getUniqueId(), coop, user.getLocation());
} }
/** /**
* @param location * @param location
*/ */