From 02ad7df8737c36d7607d73b752aafaded074c443 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sun, 5 May 2019 13:20:32 +0200 Subject: [PATCH] Fix last commit player NOT monster - Fix incomplete-switch argument --- src/main/java/com/gamingmesh/jobs/NMS.java | 3 ++- src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java | 3 ++- .../com/gamingmesh/jobs/listeners/JobsPaymentListener.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_10.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_11.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_12.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_13.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_14.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_7.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_8.java | 5 +++-- src/main/java/com/gamingmesh/jobs/nmsUtil/v1_9.java | 5 +++-- 11 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/NMS.java b/src/main/java/com/gamingmesh/jobs/NMS.java index 230d94db..45798e7c 100644 --- a/src/main/java/com/gamingmesh/jobs/NMS.java +++ b/src/main/java/com/gamingmesh/jobs/NMS.java @@ -3,6 +3,7 @@ package com.gamingmesh.jobs; import java.util.List; import org.bukkit.block.Block; import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.inventory.ItemStack; @@ -17,5 +18,5 @@ public interface NMS { public void setItemInMainHand(Player player, ItemStack item); - public double getMaxHealth(Player player); + public double getMaxHealth(LivingEntity entity); } diff --git a/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java b/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java index ee3f273b..46a93fd7 100644 --- a/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java +++ b/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java @@ -53,6 +53,7 @@ public class SignUtil { ArrayList categoriesList = new ArrayList<>(ConfCategory.getKeys(false)); if (categoriesList.isEmpty()) return; + for (String category : categoriesList) { ConfigurationSection NameSection = ConfCategory.getConfigurationSection(category); com.gamingmesh.jobs.Signs.Sign newTemp = new com.gamingmesh.jobs.Signs.Sign(); @@ -175,7 +176,7 @@ public class SignUtil { timelapse--; } else { if (one.GetNumber() > PlayerList.size()) - return true; + return true; TopList pl = PlayerList.get(one.GetNumber() - 1); String PlayerName = pl.getPlayerName(); diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index e08f5b62..a198b3a9 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -524,7 +524,6 @@ public class JobsPaymentListener implements Listener { } - @SuppressWarnings("incomplete-switch") @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onInventoryCraft(CraftItemEvent event) { // make sure plugin is enabled @@ -609,6 +608,8 @@ public class JobsPaymentListener implements Listener { case LEATHER_HELMET: case LEATHER_LEGGINGS: leather = true; + default: + break; } } @@ -1128,7 +1129,7 @@ public class JobsPaymentListener implements Listener { if (Jobs.getGCManager().MonsterDamageUse && lVictim.hasMetadata(entityDamageByPlayer)) { double damage = lVictim.getMetadata(entityDamageByPlayer).get(0).asDouble(); - double perc = (damage * 100D) / Jobs.getNms().getMaxHealth((Player) lVictim); + double perc = (damage * 100D) / Jobs.getNms().getMaxHealth(lVictim); if (perc < Jobs.getGCManager().MonsterDamagePercentage) return; } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_10.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_10.java index 9f472875..035076a0 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_10.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_10.java @@ -11,6 +11,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; import org.bukkit.entity.Zombie; import org.bukkit.entity.Horse.Variant; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Skeleton.SkeletonType; import org.bukkit.entity.Villager.Profession; import org.bukkit.event.block.BlockPistonRetractEvent; @@ -73,7 +74,7 @@ public class v1_10 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getMaxHealth(); + public double getMaxHealth(LivingEntity entity) { + return entity.getMaxHealth(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_11.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_11.java index bb5c97f8..7c7755a5 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_11.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_11.java @@ -5,6 +5,7 @@ import java.util.List; import org.bukkit.block.Block; import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.inventory.ItemStack; @@ -51,7 +52,7 @@ public class v1_11 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getMaxHealth(); + public double getMaxHealth(LivingEntity entity) { + return entity.getMaxHealth(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_12.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_12.java index ba096b88..e9a527cd 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_12.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_12.java @@ -6,6 +6,7 @@ import java.util.List; import org.bukkit.attribute.Attribute; import org.bukkit.block.Block; import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.inventory.ItemStack; @@ -52,7 +53,7 @@ public class v1_12 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); + public double getMaxHealth(LivingEntity entity) { + return entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_13.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_13.java index c1418b70..01229224 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_13.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_13.java @@ -6,6 +6,7 @@ import java.util.List; import org.bukkit.attribute.Attribute; import org.bukkit.block.Block; import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.inventory.ItemStack; @@ -36,7 +37,7 @@ public class v1_13 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); + public double getMaxHealth(LivingEntity entity) { + return entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_14.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_14.java index 7f8ef7fd..c4927dbd 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_14.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_14.java @@ -6,6 +6,7 @@ import java.util.List; import org.bukkit.attribute.Attribute; import org.bukkit.block.Block; import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.inventory.ItemStack; @@ -36,7 +37,7 @@ public class v1_14 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); + public double getMaxHealth(LivingEntity entity) { + return entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_7.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_7.java index fbe99f56..ed18f278 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_7.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_7.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; import org.bukkit.entity.Zombie; import org.bukkit.entity.Horse.Variant; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Skeleton.SkeletonType; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.inventory.ItemStack; @@ -62,7 +63,7 @@ public class v1_7 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getMaxHealth(); + public double getMaxHealth(LivingEntity entity) { + return entity.getMaxHealth(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_8.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_8.java index 86e683a0..82cbb635 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_8.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_8.java @@ -7,6 +7,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.Guardian; import org.bukkit.entity.Horse; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; import org.bukkit.entity.Zombie; @@ -68,7 +69,7 @@ public class v1_8 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getMaxHealth(); + public double getMaxHealth(LivingEntity entity) { + return entity.getMaxHealth(); } } diff --git a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_9.java b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_9.java index 1db626b1..17812a90 100644 --- a/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_9.java +++ b/src/main/java/com/gamingmesh/jobs/nmsUtil/v1_9.java @@ -7,6 +7,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.Guardian; import org.bukkit.entity.Horse; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; import org.bukkit.entity.Zombie; @@ -68,7 +69,7 @@ public class v1_9 implements NMS { } @Override - public double getMaxHealth(Player player) { - return player.getMaxHealth(); + public double getMaxHealth(LivingEntity entity) { + return entity.getMaxHealth(); } }