Banners now work in 1.7-1.13 ( Tested )

SavageLabs · Aug 11, 2018 · 70e069d · 70e069d
1 parent de3f0c4
commit 70e069d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -297,7 +297,7 @@
         <dependency>
             <groupId>com.drtshock</groupId>
             <artifactId>PlayerVaultsX</artifactId>
-            <version>4.0.6-SNAPSHOT</version>
+            <version>4.0.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java b/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
@@ -52,7 +52,15 @@ public void perform() {
 
 
         } else {
-            warBanner = P.p.createItem(Material.LEGACY_BANNER, 1, (short) 1, P.p.getConfig().getString("fbanners.Item.Name"), P.p.getConfig().getStringList("fbanners.Item.Lore"));
+            Material banner;
+            if (!P.p.mc113) {
+                banner = Material.valueOf("BANNER");
+            } else {
+                banner = Material.valueOf("LEGACY_BANNER");
+            }
+
+
+            warBanner = P.p.createItem(banner, 1, (short) 1, P.p.getConfig().getString("fbanners.Item.Name"), P.p.getConfig().getStringList("fbanners.Item.Lore"));
         }
         fme.msg(TL.COMMAND_BANNER_SUCCESS);
         warBanner.setAmount(1);

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSetBanner.java b/src/main/java/com/massivecraft/factions/cmd/CmdSetBanner.java
@@ -20,7 +20,7 @@ public CmdSetBanner() {
     }
 
     public void perform() {
-        if (me.getItemInHand().getType() != Material.LEGACY_BANNER) {
+        if (!me.getItemInHand().getType().toString().contains("BANNER")) {
             fme.msg(TL.COMMAND_SETBANNER_NOTBANNER);
             return;
         }