JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nerf scythe of the fallen lord drop rate and ability

Browse Source
This commit is contained in:
AlexTheCoder 2017-08-28 18:58:39 -04:00
parent 51cac3d61c
commit d623b07187
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/challenge/seven/ChallengeSeven.java
View File

@ -97,14 +97,17 @@ public class ChallengeSeven extends RaidChallenge<WitherRaid>
ClansManager.getInstance().getLootManager().dropRare(drop); ClansManager.getInstance().getLootManager().dropRare(drop);
drop.getWorld().dropItem(drop, new ItemStack(Material.EMERALD, emeralds)); drop.getWorld().dropItem(drop, new ItemStack(Material.EMERALD, emeralds));
} }
RareItemFactory mainFactory = RareItemFactory.begin(ItemType.LEGENDARY).setLegendary(DemonicScythe.class); if (Math.random() <= 0.03)
if (Math.random() < 0.1)
{ {
mainFactory.setSuperPrefix(FlamingAttribute.class); RareItemFactory mainFactory = RareItemFactory.begin(ItemType.LEGENDARY).setLegendary(DemonicScythe.class);
mainFactory.setPrefix(SharpAttribute.class); if (Math.random() < 0.1)
mainFactory.setSuffix(ConqueringAttribute.class); {
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)); 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().getWorldData().getCustomLocs("GATE_FIVE").get(0).getBlock().getRelative(BlockFace.DOWN).setType(Material.OBSIDIAN);
getRaid().setForceEnd(System.currentTimeMillis() + UtilTime.convert(2, TimeUnit.MINUTES, TimeUnit.MILLISECONDS)); getRaid().setForceEnd(System.currentTimeMillis() + UtilTime.convert(2, TimeUnit.MINUTES, TimeUnit.MILLISECONDS));

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/DemonicScythe.java
View File

@ -3,9 +3,11 @@ package mineplex.game.clans.items.legendaries;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.recharge.Recharge;
import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.ClansUtility; import mineplex.game.clans.clans.ClansUtility;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
@ -67,6 +69,9 @@ public class DemonicScythe extends LegendaryItem
return; return;
} }
event.AddMod("Scythe of the Fallen Lord", 8); 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));
}
} }
} }