Merge pull request #34 from BerndiVader/dev

fixes for #24 & #33
BerndiVader · Jan 26, 2019 · 77ea28b · 77ea28b
2 parents 983d2cc + 3d7909a
commit 77ea28b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/MythicMobsQuests.jar b/MythicMobsQuests.jar
diff --git a/src/com/gmail/berndivader/mythicmobsquests/MythicMobsItemRequire.java b/src/com/gmail/berndivader/mythicmobsquests/MythicMobsItemRequire.java
@@ -43,7 +43,7 @@ public boolean testRequirement(Player player, Map<String, Object> data) {
 		if (s2.toUpperCase().equals("NONE")) s2=null;
 		if (s3.toUpperCase().equals("NONE")) s3=null;
 		if (s4.toUpperCase().equals("NONE")) s4=null;
-		RangedDouble rd=new RangedDouble((String)data.get("Amount"));
+		RangedDouble rd=new RangedDouble(data.get("Amount").toString());
 		String str2=data.get("Material").toString().toUpperCase();
 		if (!str2.equals("ANY")) {
 			try {

diff --git a/src/com/gmail/berndivader/mythicmobsquests/MythicMobsItemReward.java b/src/com/gmail/berndivader/mythicmobsquests/MythicMobsItemReward.java
@@ -29,12 +29,12 @@ public MythicMobsItemReward() {
 	public void giveReward(Player player, Map<String, Object> data) {
 		try {
 			String[]arr1=data.get("MythicItem").toString().split(",");
-			String s2=(String)data.getOrDefault("Amount","1");
-			String s1=(String)data.getOrDefault("ItemMarker","NONE");
-			String s3=(String)data.getOrDefault("RewardName",null);
+			String s2=data.getOrDefault("Amount","1").toString();
+			String s1=data.getOrDefault("ItemMarker","NONE").toString();
+			String s3=data.getOrDefault("RewardName",null).toString();
 			if (s1.equals("NONE")) s1=null;
-			boolean notify=Boolean.parseBoolean((String)data.getOrDefault("Notify","TRUE"));
-			boolean stackable=Boolean.parseBoolean((String)data.getOrDefault("Stackable","TRUE"));
+			boolean notify=Boolean.parseBoolean(data.getOrDefault("Notify","TRUE").toString());
+			boolean stackable=Boolean.parseBoolean(data.getOrDefault("Stackable","TRUE").toString());
 			if(s3!=null) player.sendMessage(ChatColor.GOLD+s3);
 			Utils.createAndDropItemStack(arr1,s1,Utils.randomRangeInt(s2),player,notify,stackable);
 		} catch (Exception ex) {

diff --git a/src/com/gmail/berndivader/mythicmobsquests/MythicMobsKillObjective.java b/src/com/gmail/berndivader/mythicmobsquests/MythicMobsKillObjective.java
@@ -64,11 +64,11 @@ public void onMythicMobDeathEvent (EntityDeathEvent e) {
 		for (Quest q : qp.getCurrentQuests().keySet()) {
 			Map<String, Object> m = getDataForPlayer(p, this, q);
 			if (m == null) continue;
-			Optional<String>maybeKT=Optional.ofNullable((String)m.get("Internal Mobnames"));
-			Optional<String>maybePARSE=Optional.ofNullable((String)m.get("Mob Level"));
-			Optional<String>maybeFaction=Optional.ofNullable((String)m.get("Mob Faction"));
-			Optional<String>maybeNotifier=Optional.ofNullable((String)m.get("Notifier enabled"));
-			Optional<String>maybeNotifierMsg=Optional.ofNullable((String)m.get("Notifier msg"));
+			Optional<String>maybeKT=Optional.ofNullable(m.get("Internal Mobnames").toString());
+			Optional<String>maybePARSE=Optional.ofNullable(m.get("Mob Level").toString());
+			Optional<String>maybeFaction=Optional.ofNullable(m.get("Mob Faction").toString());
+			Optional<String>maybeNotifier=Optional.ofNullable(m.get("Notifier enabled").toString());
+			Optional<String>maybeNotifierMsg=Optional.ofNullable(m.get("Notifier msg").toString());
 			String[]kt=maybeKT.orElse("ANY").split(",");
 			String[]parseLvl=maybePARSE.orElse("0").split("-");
 			String[]faction=maybeFaction.orElse("ANY").split(",");