mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Replace item checks with ID checks

Browse Source
This commit is contained in:
WalshyDev 2019-09-10 16:10:26 +01:00
parent b7714efbac
commit 181165300e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java
View File

@ -40,21 +40,21 @@ public class ArmorListener implements Listener {
Player p = (Player) e.getEntity();
for (ItemStack armor: p.getInventory().getArmorContents()) {
SlimefunItem item = SlimefunItem.getByItem(armor);
if (armor != null && item != null) {
if (item.isItem(SlimefunItems.ENDER_BOOTS)
if (item != null) {
if (item.getID().equals("ENDER_BOOTS")
&& Slimefun.hasUnlocked(p, SlimefunItems.ENDER_BOOTS, true)
&& e instanceof EntityDamageByEntityEvent
&& ((EntityDamageByEntityEvent) e).getDamager() instanceof EnderPearl
) {
e.setCancelled(true);
}
else if (item.isItem(SlimefunItems.SLIME_BOOTS)
else if (item.getID().equals("SLIME_BOOTS")
&& Slimefun.hasUnlocked(p, SlimefunItems.SLIME_BOOTS, true)
&& e.getCause() == DamageCause.FALL
) {
e.setCancelled(true);
}
else if (item.isItem(SlimefunItems.BOOTS_OF_THE_STOMPER)
else if (item.getID().equals("BOOTS_OF_THE_STOMPER")
&& Slimefun.hasUnlocked(p,
SlimefunItems.BOOTS_OF_THE_STOMPER, true)
&& e.getCause() == DamageCause.FALL
@ -83,7 +83,7 @@ public class ArmorListener implements Listener {
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType());
}
}
else if (item.isItem(SlimefunItems.SLIME_BOOTS_STEEL)
else if (item.getID().equals("SLIME_STEEL_BOOTS")
&& Slimefun.hasUnlocked(p, SlimefunItems.SLIME_BOOTS_STEEL, true)
&& e.getCause() == DamageCause.FALL
)
@ -99,7 +99,7 @@ public class ArmorListener implements Listener {
&& e.getClickedBlock() != null
&& e.getClickedBlock().getType() == Material.FARMLAND
&& SlimefunManager.isItemSimiliar(e.getPlayer().getInventory().getBoots(),
SlimefunItem.getItem("FARMER_SHOES"), true)
SlimefunItems.FARMER_SHOES, true)
)
e.setCancelled(true);
}