From d623b07187f7988e878e68b1423af6ff1922b72e Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Mon, 28 Aug 2017 18:58:39 -0400 Subject: [PATCH] Nerf scythe of the fallen lord drop rate and ability --- .../wither/challenge/seven/ChallengeSeven.java | 15 +++++++++------ .../clans/items/legendaries/DemonicScythe.java | 7 ++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/challenge/seven/ChallengeSeven.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/challenge/seven/ChallengeSeven.java index 40bc48f44..31808c714 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/challenge/seven/ChallengeSeven.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/challenge/seven/ChallengeSeven.java @@ -97,14 +97,17 @@ public class ChallengeSeven extends RaidChallenge ClansManager.getInstance().getLootManager().dropRare(drop); drop.getWorld().dropItem(drop, new ItemStack(Material.EMERALD, emeralds)); } - RareItemFactory mainFactory = RareItemFactory.begin(ItemType.LEGENDARY).setLegendary(DemonicScythe.class); - if (Math.random() < 0.1) + if (Math.random() <= 0.03) { - mainFactory.setSuperPrefix(FlamingAttribute.class); - mainFactory.setPrefix(SharpAttribute.class); - mainFactory.setSuffix(ConqueringAttribute.class); + RareItemFactory mainFactory = RareItemFactory.begin(ItemType.LEGENDARY).setLegendary(DemonicScythe.class); + if (Math.random() < 0.1) + { + mainFactory.setSuperPrefix(FlamingAttribute.class); + mainFactory.setPrefix(SharpAttribute.class); + mainFactory.setSuffix(ConqueringAttribute.class); + } + _altar.getWorld().dropItem(_altar.clone().add(0, 2, 0), mainFactory.fabricate()); } - _altar.getWorld().dropItem(_altar.clone().add(0, 2, 0), mainFactory.fabricate()); ClansManager.getInstance().getBlockRestore().restore(getRaid().getWorldData().getCustomLocs("GATE_FIVE").get(0).getBlock().getRelative(BlockFace.DOWN)); getRaid().getWorldData().getCustomLocs("GATE_FIVE").get(0).getBlock().getRelative(BlockFace.DOWN).setType(Material.OBSIDIAN); getRaid().setForceEnd(System.currentTimeMillis() + UtilTime.convert(2, TimeUnit.MINUTES, TimeUnit.MILLISECONDS)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/DemonicScythe.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/DemonicScythe.java index 06d840826..cf4c10590 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/DemonicScythe.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/DemonicScythe.java @@ -3,9 +3,11 @@ package mineplex.game.clans.items.legendaries; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.entity.Entity; +import org.bukkit.entity.Horse; import org.bukkit.entity.Player; import mineplex.core.common.util.C; +import mineplex.core.recharge.Recharge; import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.ClansUtility; import mineplex.minecraft.game.core.damage.CustomDamageEvent; @@ -67,6 +69,9 @@ public class DemonicScythe extends LegendaryItem return; } event.AddMod("Scythe of the Fallen Lord", 8); - wielder.setHealth(Math.min(wielder.getMaxHealth(), wielder.getHealth() + 2)); + if (!(event.GetDamageeEntity() instanceof Horse) && Recharge.Instance.use(wielder, "Demonic Scythe Heal", 500, false, false)) + { + wielder.setHealth(Math.min(wielder.getMaxHealth(), wielder.getHealth() + 2)); + } } } \ No newline at end of file