Browse Source

Refactoring: down't use VersionUtil for setUnbreakable()

RedstoneFuture 2 years ago
parent
commit
b9b3a49001

+ 12 - 21
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -541,10 +541,10 @@ public class Game {
             bow.addEnchantment(Enchantment.ARROW_FIRE, 1);
             bow.addEnchantment(Enchantment.ARROW_DAMAGE, 1);
             bow.addEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
-            ItemMeta im = bow.getItemMeta();
-            im.addEnchant(Enchantment.DAMAGE_ALL, 6, true);
-            bow.setItemMeta(im);
-            VersionUtil.setUnbreakable(bow);
+            ItemMeta bowMeta = bow.getItemMeta();
+            bowMeta.setUnbreakable(true);
+            bowMeta.addEnchant(Enchantment.DAMAGE_ALL, 6, true);
+            bow.setItemMeta(bowMeta);
             this.customBow = bow;
         }
 
@@ -552,7 +552,9 @@ public class Game {
         if (this.getArena().getSpawn().isSendPickaxe() || this.getArena().getRespawn().isSendPickaxe()) {
 
             ItemStack pickaxe = new ItemStack(Material.IRON_PICKAXE);
-            VersionUtil.setUnbreakable(pickaxe);
+            ItemMeta pickaxeMeta = pickaxe.getItemMeta();
+            pickaxeMeta.setUnbreakable(true);
+            pickaxe.setItemMeta(pickaxeMeta);
             this.customPickaxe = pickaxe;
         }
 
@@ -582,26 +584,15 @@ public class Game {
         // send kit items
         if (isRespawn) {
 
-            if (this.getArena().getRespawn().isSendBow()) {
-                player.getInventory().addItem(this.customBow);
-            }
-
-            if (this.getArena().getRespawn().isSendPickaxe()) {
-                player.getInventory().addItem(this.customPickaxe);
-            }
+            if (this.getArena().getRespawn().isSendBow()) player.getInventory().addItem(this.customBow);
+            if (this.getArena().getRespawn().isSendPickaxe()) player.getInventory().addItem(this.customPickaxe);
 
         } else {
 
-            if (this.getArena().getSpawn().isSendBow()) {
-                player.getInventory().addItem(this.customBow);
-            }
-
-            if (this.getArena().getSpawn().isSendPickaxe()) {
-                player.getInventory().addItem(this.customPickaxe);
-            }
-
+            if (this.getArena().getSpawn().isSendBow()) player.getInventory().addItem(this.customBow);
+            if (this.getArena().getSpawn().isSendPickaxe()) player.getInventory().addItem(this.customPickaxe);
+            
         }
-
     }
 
     /**

+ 5 - 6
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Team.java

@@ -24,7 +24,6 @@ import de.butzlabben.missilewars.game.enums.GameResult;
 import de.butzlabben.missilewars.player.MWPlayer;
 import de.butzlabben.missilewars.util.MoneyUtil;
 import de.butzlabben.missilewars.util.version.ColorConverter;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -119,28 +118,28 @@ public class Team {
 
         ItemStack boots = new ItemStack(Material.LEATHER_BOOTS);
         LeatherArmorMeta bootsMeta = (LeatherArmorMeta) boots.getItemMeta();
+        bootsMeta.setUnbreakable(true);
         bootsMeta.setColor(color);
         boots.setItemMeta(bootsMeta);
-        VersionUtil.setUnbreakable(boots);
 
         ItemStack leggings = new ItemStack(Material.LEATHER_LEGGINGS);
         LeatherArmorMeta leggingsMeta = (LeatherArmorMeta) leggings.getItemMeta();
+        leggingsMeta.setUnbreakable(true);
         leggingsMeta.setColor(color);
         leggings.setItemMeta(leggingsMeta);
-        VersionUtil.setUnbreakable(leggings);
 
         ItemStack chestplate = new ItemStack(Material.LEATHER_CHESTPLATE);
         LeatherArmorMeta chestplateMeta = (LeatherArmorMeta) chestplate.getItemMeta();
+        chestplateMeta.setUnbreakable(true);
         chestplateMeta.setColor(color);
         chestplate.setItemMeta(chestplateMeta);
-        VersionUtil.setUnbreakable(chestplate);
 
         ItemStack helmet = new ItemStack(Material.LEATHER_HELMET);
         LeatherArmorMeta helmetMeta = (LeatherArmorMeta) helmet.getItemMeta();
+        helmetMeta.setUnbreakable(true);
         helmetMeta.setColor(color);
         helmet.setItemMeta(helmetMeta);
-        VersionUtil.setUnbreakable(helmet);
-
+        
         teamArmor = new ItemStack[] {boots, leggings, chestplate, helmet};
     }
 

+ 0 - 6
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/version/VersionUtil.java

@@ -111,11 +111,5 @@ public class VersionUtil {
     public static boolean isWallSignMaterial(Material material) {
         return material.name().contains("_SIGN");
     }
-
-    public static void setUnbreakable(ItemStack is) {
-        ItemMeta im = is.getItemMeta();
-        im.setUnbreakable(true);
-        is.setItemMeta(im);
-    }
     
 }