diff --git a/pom.xml b/pom.xml index 9e5fd69..0ae37d6 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 21 21 UTF-8 - 1.9.1 + 1.9.2 3.2.4 diff --git a/src/main/java/me/alexpresso/zuninja/classes/corporation/Corporation.java b/src/main/java/me/alexpresso/zuninja/classes/corporation/Corporation.java index 928ab02..89ea470 100644 --- a/src/main/java/me/alexpresso/zuninja/classes/corporation/Corporation.java +++ b/src/main/java/me/alexpresso/zuninja/classes/corporation/Corporation.java @@ -25,8 +25,10 @@ public Map getCalculatedBonusValues() { final var bonusValues = new HashMap(); for(final var type : CorporationBonusType.values()) { - if(!corporationBonuses.containsKey(type)) + if(this.corporationBonuses == null || !corporationBonuses.containsKey(type)) { + bonusValues.put(type, 0D); continue; + } final var bonus = corporationBonuses.get(type); diff --git a/src/main/java/me/alexpresso/zuninja/domain/nodes/user/User.java b/src/main/java/me/alexpresso/zuninja/domain/nodes/user/User.java index 1714840..aea4db1 100644 --- a/src/main/java/me/alexpresso/zuninja/domain/nodes/user/User.java +++ b/src/main/java/me/alexpresso/zuninja/domain/nodes/user/User.java @@ -25,6 +25,22 @@ public class User extends BaseGraphObject { private Set inventory = new HashSet<>(); + public String getDiscordId() { + return discordId; + } + public User setDiscordId(String discordId) { + this.discordId = discordId; + return this; + } + + public String getDiscordUserName() { + return discordUserName; + } + public User setDiscordUserName(String discordUserName) { + this.discordUserName = discordUserName; + return this; + } + public int getPosition() { return position; }