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

Fixed some code smells

Browse Source
This commit is contained in:
Florian CUNY 2018-10-14 10:09:04 +02:00
parent cae214f856
commit 7248fb3e14
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
View File

@ -36,7 +36,7 @@ public class AddonClassLoader extends URLClassLoader {
MalformedURLException, MalformedURLException,
InvalidDescriptionException, InvalidDescriptionException,
InstantiationException, InstantiationException,
IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { IllegalAccessException, InvocationTargetException, NoSuchMethodException {
super(new URL[]{path.toURI().toURL()}, parent); super(new URL[]{path.toURI().toURL()}, parent);
loader = addonsManager; loader = addonsManager;

3
src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
View File

@ -7,6 +7,7 @@ import java.util.UUID;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.metadata.MetadataValue;
import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.commands.ConfirmableCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand;
import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.localization.TextVariables;
@ -47,7 +48,7 @@ public class AdminWhyCommand extends ConfirmableCommand {
} }
// Determine the debug mode and toggle if required // Determine the debug mode and toggle if required
boolean newValue = !target.getPlayer().getMetadata(getWorld().getName() + "_why_debug").stream() boolean newValue = !target.getPlayer().getMetadata(getWorld().getName() + "_why_debug").stream()
.filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(p -> p.asBoolean()).orElse(false); .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(MetadataValue::asBoolean).orElse(false);
if (newValue) { if (newValue) {
user.sendMessage("commands.admin.why.turning-on", TextVariables.NAME, target.getName()); user.sendMessage("commands.admin.why.turning-on", TextVariables.NAME, target.getName());
} else { } else {

4
src/main/java/world/bentobox/bentobox/api/commands/admin/schem/AdminSchemCommand.java
View File

@ -20,8 +20,8 @@ public class AdminSchemCommand extends ConfirmableCommand {
// Map containing selection cuboid display tasks // Map containing selection cuboid display tasks
private Map<User, Integer> display; private Map<User, Integer> display;
private final Particle PARTICLE = Particle.REDSTONE; private static final Particle PARTICLE = Particle.REDSTONE;
private final Particle.DustOptions PARTICLE_DUST_OPTIONS = new Particle.DustOptions(Color.RED, 1.0F); private static final Particle.DustOptions PARTICLE_DUST_OPTIONS = new Particle.DustOptions(Color.RED, 1.0F);
public AdminSchemCommand(CompositeCommand parent) { public AdminSchemCommand(CompositeCommand parent) {
super(parent, "schem"); super(parent, "schem");

6
src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java
View File

@ -9,6 +9,7 @@ import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.metadata.MetadataValue;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.api.user.User;
@ -30,7 +31,6 @@ public abstract class AbstractFlagListener implements Listener {
* *
*/ */
enum Why { enum Why {
UNPROTECTED_WORLD, UNPROTECTED_WORLD,
OP, OP,
BYPASS_EVERYWHERE, BYPASS_EVERYWHERE,
@ -226,9 +226,9 @@ public abstract class AbstractFlagListener implements Listener {
private void report(User user, Event e, Location loc, Flag flag, Why why) { private void report(User user, Event e, Location loc, Flag flag, Why why) {
if (user != null && user.getPlayer().getMetadata(loc.getWorld().getName() + "_why_debug").stream() if (user != null && user.getPlayer().getMetadata(loc.getWorld().getName() + "_why_debug").stream()
.filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(p -> p.asBoolean()).orElse(false)) { .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(MetadataValue::asBoolean).orElse(false)) {
plugin.log("Why: " + e.getEventName() + " in world " + loc.getWorld().getName() + " at " + Util.xyz(loc.toVector())); plugin.log("Why: " + e.getEventName() + " in world " + loc.getWorld().getName() + " at " + Util.xyz(loc.toVector()));
plugin.log("Why: " + (user == null ? "Unknown" : user.getName()) + " " + flag.getID() + " - " + why.name()); plugin.log("Why: " + user.getName() + " " + flag.getID() + " - " + why.name());
} }
} }

2
src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
View File

@ -106,7 +106,7 @@ public class IslandWorldManager {
*/ */
public Map<String, String> getOverWorldNames() { public Map<String, String> getOverWorldNames() {
return worldSettings.values().stream() return worldSettings.values().stream()
.collect(Collectors.toMap(ws -> ws.getWorldName(), ws -> ws.getAddon().map(a -> a.getDescription().getName()).orElse("None"))); .collect(Collectors.toMap(WorldSettings::getWorldName, ws -> ws.getAddon().map(a -> a.getDescription().getName()).orElse("None")));
} }
/** /**