Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-01 05:57:54 +01:00
Code Issues Projects Releases Wiki Activity

Fixes some code smells.

Browse Source
This commit is contained in:
tastybento 2018-12-13 08:10:33 +09:00
parent f61b109060
commit ca844f1727
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/world/bentobox/bentobox/hooks/VaultHook.java
View File

@ -12,6 +12,7 @@ import world.bentobox.bentobox.api.user.User;
*/ */
public class VaultHook extends Hook { public class VaultHook extends Hook {
private static final String AMOUNT_MUST_BE_POSITIVE = "Amount must be positive.";
private Economy economy; private Economy economy;
public VaultHook() { public VaultHook() {
@ -61,7 +62,7 @@ public class VaultHook extends Hook {
throw new IllegalArgumentException("User must be a Player or an OfflinePlayer"); throw new IllegalArgumentException("User must be a Player or an OfflinePlayer");
} }
if (amount < 0.0D) { if (amount < 0.0D) {
throw new IllegalArgumentException("Amount must be positive."); throw new IllegalArgumentException(AMOUNT_MUST_BE_POSITIVE);
} }
return economy.withdrawPlayer(user.getPlayer(), amount); return economy.withdrawPlayer(user.getPlayer(), amount);
} }
@ -77,7 +78,7 @@ public class VaultHook extends Hook {
throw new IllegalArgumentException("User must be a Player or an OfflinePlayer"); throw new IllegalArgumentException("User must be a Player or an OfflinePlayer");
} }
if (amount < 0.0D) { if (amount < 0.0D) {
throw new IllegalArgumentException("Amount must be positive."); throw new IllegalArgumentException(AMOUNT_MUST_BE_POSITIVE);
} }
return economy.depositPlayer(user.getPlayer(), amount); return economy.depositPlayer(user.getPlayer(), amount);
} }
@ -92,7 +93,7 @@ public class VaultHook extends Hook {
*/ */
public boolean has(User user, double amount) { public boolean has(User user, double amount) {
if (amount < 0.0D) { if (amount < 0.0D) {
throw new IllegalArgumentException("Amount must be positive."); throw new IllegalArgumentException(AMOUNT_MUST_BE_POSITIVE);
} }
return user.isPlayer() && economy.has(user.getPlayer(), amount); return user.isPlayer() && economy.has(user.getPlayer(), amount);
} }

4
src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
View File

@ -88,9 +88,9 @@ public class JoinLeaveListener implements Listener {
plugin.getIWM().getOverWorlds().forEach(w -> { plugin.getIWM().getOverWorlds().forEach(w -> {
Island island = plugin.getIslands().getIsland(w, User.getInstance(event.getPlayer())); Island island = plugin.getIslands().getIsland(w, User.getInstance(event.getPlayer()));
// Are there any online players still for this island? // Are there any online players still for this island?
if (island != null && !plugin.getServer().getOnlinePlayers().stream() if (island != null && plugin.getServer().getOnlinePlayers().stream()
.filter(p -> !event.getPlayer().equals(p)) .filter(p -> !event.getPlayer().equals(p))
.anyMatch(p -> plugin.getIslands().getMembers(w, event.getPlayer().getUniqueId()).contains(p.getUniqueId()))) { .noneMatch(p -> plugin.getIslands().getMembers(w, event.getPlayer().getUniqueId()).contains(p.getUniqueId()))) {
// No, there are no more players online on this island // No, there are no more players online on this island
// Tell players they are being removed // Tell players they are being removed
island.getMembers().entrySet().stream() island.getMembers().entrySet().stream()

6
src/main/java/world/bentobox/bentobox/listeners/flags/BreedingListener.java
View File

@ -40,10 +40,8 @@ public class BreedingListener extends FlagListener {
if (e.getHand().equals(EquipmentSlot.OFF_HAND)) { if (e.getHand().equals(EquipmentSlot.OFF_HAND)) {
inHand = e.getPlayer().getInventory().getItemInOffHand(); inHand = e.getPlayer().getInventory().getItemInOffHand();
} }
if (inHand != null && BREEDING_ITEMS.contains(inHand.getType())) { if (inHand != null && BREEDING_ITEMS.contains(inHand.getType()) && !checkIsland(e, e.getRightClicked().getLocation(), Flags.BREEDING)) {
if (!checkIsland(e, e.getRightClicked().getLocation(), Flags.BREEDING)) { ((Animals)e.getRightClicked()).setBreed(false);
((Animals)e.getRightClicked()).setBreed(false);
}
} }
} }
} }