From bbbe2565ebc257b4ac9113190aa7ec0be6379760 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 29 Aug 2019 15:41:56 -0700 Subject: [PATCH] Fixed two security issues from sonar --- .../bentobox/bentobox/api/flags/Flag.java | 26 +++++++++---------- .../json/adapters/ItemStackTypeAdapter.java | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java index fc1329a99..5b09546f2 100644 --- a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java @@ -91,12 +91,12 @@ public class Flag implements Comparable { */ public Mode getNext() { switch(this) { - case ADVANCED: - return EXPERT; - case BASIC: - return ADVANCED; - default: - return BASIC; + case ADVANCED: + return EXPERT; + case BASIC: + return ADVANCED; + default: + return BASIC; } } @@ -107,12 +107,12 @@ public class Flag implements Comparable { */ public boolean isGreaterThan(Mode rank) { switch(this) { - case EXPERT: - return rank.equals(BASIC) || rank.equals(ADVANCED); - case ADVANCED: - return rank.equals(BASIC); - default: - return false; + case EXPERT: + return rank.equals(BASIC) || rank.equals(ADVANCED); + case ADVANCED: + return rank.equals(BASIC); + default: + return false; } } } @@ -478,7 +478,7 @@ public class Flag implements Comparable { private int cooldown; // Mode - public Mode mode = Mode.EXPERT; + private Mode mode = Mode.EXPERT; /** * Builder for making flags diff --git a/src/main/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapter.java b/src/main/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapter.java index efc83c300..e368d7589 100644 --- a/src/main/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/json/adapters/ItemStackTypeAdapter.java @@ -42,7 +42,6 @@ public class ItemStackTypeAdapter extends TypeAdapter { c.loadFromString(reader.nextString()); return c.getItemStack("is"); } catch (InvalidConfigurationException e) { - e.printStackTrace(); throw new IOException(e.getMessage()); } }