EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Removed support for combining armored elytras with enchanted books. It was too buggy.

Browse Source
This commit is contained in:
Pim van der Loos
2017-09-07 13:43:58 +02:00
parent 52c391d025
commit 9610958e28
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/nl/pim16aap2/armoredElytra/EventHandlers.java
View File

@@ -176,8 +176,7 @@ public class EventHandlers implements Listener {
if (anvilInventory.getItem(0).getType() == Material.ELYTRA) { if (anvilInventory.getItem(0).getType() == Material.ELYTRA) {
ItemStack result = null; ItemStack result = null;
// Check if the second input slot contains a diamond chestplate. // Check if the second input slot contains a diamond chestplate.
if (anvilInventory.getItem(1).getType() == Material.DIAMOND_CHESTPLATE || if (anvilInventory.getItem(1).getType() == Material.DIAMOND_CHESTPLATE) {
(anvilInventory.getItem(1).getType() == Material.ENCHANTED_BOOK && isArmoredElytra(anvilInventory.getItem(0)))) {
// Combine the enchantments of the two items in the input slots. // Combine the enchantments of the two items in the input slots.
result = addEnchants(anvilInventory.getItem(0), anvilInventory.getItem(1), p); result = addEnchants(anvilInventory.getItem(0), anvilInventory.getItem(1), p);
if (anvilInventory.getItem(1).getType() == Material.DIAMOND_CHESTPLATE) { if (anvilInventory.getItem(1).getType() == Material.DIAMOND_CHESTPLATE) {
@@ -198,7 +197,7 @@ public class EventHandlers implements Listener {
} }
// Put the created item in the second slot of the anvil. // Put the created item in the second slot of the anvil.
if (result!=null) { if (result!=null) {
if (anvilInventory.getItem(1).getType() == Material.DIAMOND_CHESTPLATE/* || isArmoredElytra(anvilInventory.getItem(0))*/) { if (anvilInventory.getItem(1).getType() == Material.DIAMOND_CHESTPLATE) {
ItemMeta itemmeta = result.getItemMeta(); ItemMeta itemmeta = result.getItemMeta();
itemmeta.setDisplayName(ChatColor.AQUA+"Armored Elytra"); itemmeta.setDisplayName(ChatColor.AQUA+"Armored Elytra");
itemmeta.setLore(Arrays.asList("This is an armored Elytra.")); itemmeta.setLore(Arrays.asList("This is an armored Elytra."));
@@ -230,16 +229,6 @@ public class EventHandlers implements Listener {
anvilInventory.setItem(2, result); anvilInventory.setItem(2, result);
} }
} }
// Super ugly way of making sure that when applying enchantments from an enchanted book to an elytra, the result has a higher chance of showing up.
if (anvilInventory.getItem(1).getType() == Material.ENCHANTED_BOOK) {
p.updateInventory();
p.updateInventory();
p.updateInventory();
p.updateInventory();
p.updateInventory();
p.updateInventory();
p.sendMessage(ChatColor.GREEN+"Combining enchanted books with elytras IS possible, but sometimes you have to remove the book and put it back a few times.");
}
} }
p.updateInventory(); p.updateInventory();
} }