From 88b55ea86690929513556158b678f3ee117da5d7 Mon Sep 17 00:00:00 2001 From: Driftay Date: Fri, 22 Mar 2019 23:16:51 -0400 Subject: [PATCH 01/10] Fixed EventException in Essentials Home Patches --- .../massivecraft/factions/listeners/FactionsPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index df6b2f33..23a2a469 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -500,7 +500,7 @@ public class FactionsPlayerListener implements Listener { boolean isHome = false; for (String str : SavageFactions.plugin.ess.getUser(event.getPlayer()).getHomes()) { Location home = SavageFactions.plugin.ess.getUser(event.getPlayer()).getHome(str); - if (home.getBlockX() == event.getTo().getBlockX() && home.getBlockY() == event.getTo().getBlockY() && home.getBlockZ() == event.getTo().getBlockZ()) { + if (home.getBlockX() == event.getTo().getBlockX() && home.getBlockZ() == event.getTo().getBlockZ()) { isHome = true; } } From 9bbb3b35abebd06127afd082a7c49a9e6011803f Mon Sep 17 00:00:00 2001 From: Driftay Date: Sat, 23 Mar 2019 01:45:14 -0400 Subject: [PATCH 02/10] Fixed Lingering Potion Event Exception --- .../factions/listeners/FactionsPlayerListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 23a2a469..d4b57787 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -748,9 +748,9 @@ public class FactionsPlayerListener implements Listener { if (event.getPlayer().getItemInHand() != null) { Material handItem = event.getPlayer().getItemInHand().getType(); if (handItem.isEdible() - || handItem.equals(Material.POTION) - || handItem.equals(Material.LINGERING_POTION) - || handItem.equals(Material.SPLASH_POTION)) { + || handItem.equals(MultiversionMaterials.POTION.parseMaterial()) + || handItem.equals(MultiversionMaterials.LINGERING_POTION.parseMaterial()) + || handItem.equals(MultiversionMaterials.SPLASH_POTION.parseMaterial())) { return; } } From 6cd2a80c36f97db54bbc83928a9e4a86693b278f Mon Sep 17 00:00:00 2001 From: Driftay Date: Sat, 23 Mar 2019 02:02:46 -0400 Subject: [PATCH 03/10] Fixed F PayPal --- .../factions/cmd/CmdPaypalSee.java | 23 +++++++++++-------- .../factions/cmd/CmdPaypalSet.java | 21 +++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java index 29a789fe..c7b77cb5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java @@ -8,9 +8,11 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdPaypalSee extends FCommand { public CmdPaypalSee() { aliases.add("seepaypal"); - aliases.add("getpaypal"); + requiredArgs.add("faction"); + permission = Permission.ADMIN.node; + disableOnLock = false; senderMustBePlayer = false; senderMustBeMember = false; @@ -19,28 +21,29 @@ public class CmdPaypalSee extends FCommand { senderMustBeAdmin = false; } - + @Override public void perform() { if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { fme.msg(TL.GENERIC_DISABLED); - } else { + return; + } Faction faction = argAsFaction(0); - if (faction != null) { + if (faction != null) + return; + if (!faction.isWilderness() && !faction.isSafeZone() && !faction.isWarZone()) { + fme.msg(TL.COMMAND_PAYPALSEE_FACTION_NOFACTION.toString(), me.getName()); + return; + } if (faction.getPaypal() != null) { fme.msg(TL.COMMAND_PAYPALSEE_FACTION_PAYPAL.toString(), faction.getTag(), faction.getPaypal()); } else { fme.msg(TL.COMMAND_PAYPALSEE_FACTION_NOTSET.toString(), faction.getTag(), faction.getPaypal()); } - - } else { - fme.msg(TL.COMMAND_PAYPALSEE_FACTION_NOFACTION.toString(), me.getName()); } - } - } - } + @Override public TL getUsageTranslation() { return TL.COMMAND_PAYPALSEE_DESCRIPTION; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java index 02b1b3a4..b0efece7 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java @@ -8,30 +8,31 @@ public class CmdPaypalSet extends FCommand { public CmdPaypalSet() { this.aliases.add("setpaypal"); - this.aliases.add("paypal"); this.requiredArgs.add("email"); this.permission = Permission.PAYPALSET.node; this.disableOnLock = false; this.senderMustBePlayer = true; this.senderMustBeMember = false; this.senderMustBeModerator = false; - this.senderMustBeColeader = true; - this.senderMustBeAdmin = false; + this.senderMustBeColeader = false; + this.senderMustBeAdmin = true; } - + @Override public void perform() { if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { fme.msg(TL.GENERIC_DISABLED); - } else { - String paypal = argAsString(0); - if (paypal != null) { - myFaction.paypalSet(paypal); - fme.msg(TL.COMMAND_PAYPALSET_SUCCESSFUL, paypal); - } + return; } + + String paypal = this.argAsString(0); + if(paypal == null) + return; + myFaction.paypalSet(paypal); + fme.msg(TL.COMMAND_PAYPALSET_SUCCESSFUL, paypal); } + @Override public TL getUsageTranslation() { return TL.COMMAND_PAYPALSET_DESCRIPTION; } From 173676fa31728f341e858a834e8e2e271013b8d5 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 27 Mar 2019 10:47:47 -0400 Subject: [PATCH 04/10] Fixed TNT and Obsidian Bug --- .../massivecraft/factions/listeners/FactionsEntityListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index c54a7894..e7651f05 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -280,7 +280,7 @@ public class FactionsEntityListener implements Listener { @SuppressWarnings("deprecation") int id = target.getType().getId(); // ignore air, bedrock, water, lava, obsidian, enchanting table, etc.... too bad we can't get a blast resistance value through Bukkit yet - if (id != 0 && (id < 7 || id > 11) && id != 49 && id != 90 && id != 116 && id != 119 && id != 120 && id != 130) { + if (id != 0 && (id < 7 || id > 11) && id != 90 && id != 116 && id != 119 && id != 120 && id != 130) { target.breakNaturally(); } } From ec368273781af86bb6eab04f9298638e17948c76 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 27 Mar 2019 10:54:32 -0400 Subject: [PATCH 05/10] Runnable to Lambda --- .../com/massivecraft/factions/cmd/CmdFly.java | 165 +++++++++--------- 1 file changed, 78 insertions(+), 87 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java index d5072e82..9248a20d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java @@ -44,10 +44,54 @@ public class CmdFly extends FCommand { return; } - id = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { + id = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { + for (String name : flyMap.keySet()) { + Player player = Bukkit.getPlayer(name); + if (player == null) { + continue; + } + if (!player.isFlying()) { + continue; + } + if (!SavageFactions.plugin.mc17) { + if (player.getGameMode() == GameMode.SPECTATOR) { + continue; + } + } + + if (FPlayers.getInstance().getByPlayer(player).isVanished()) { + // Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation. + // But we can keep it as a config. + if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enable-While-Vanished")) { + return; + } + continue; + } + if (SavageFactions.plugin.useNonPacketParticles) { + // 1.9+ based servers will use the built in particleAPI instead of packet based. + // any particle amount higher than 0 made them go everywhere, and the offset at 0 was not working. + // So setting the amount to 0 spawns 1 in the precise location + player.getWorld().spawnParticle(Particle.CLOUD, player.getLocation().add(0, -0.35, 0), 0); + } else { + ParticleEffect.CLOUD.display((float) 0, (float) 0, (float) 0, (float) 0, 3, player.getLocation().add(0, -0.35, 0), 16); + } + + } + if (flyMap.keySet().size() == 0) { + Bukkit.getScheduler().cancelTask(id); + id = -1; + } + }, 10L, 3L); + } + + public static void startFlyCheck() { + flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { //threw the exception for now, until I recode fly :( Cringe. + checkTaskState(); + if (flyMap.keySet().size() != 0) { for (String name : flyMap.keySet()) { + if (name == null) { + continue; + } Player player = Bukkit.getPlayer(name); if (player == null) { continue; @@ -55,88 +99,38 @@ public class CmdFly extends FCommand { if (!player.isFlying()) { continue; } - if (!SavageFactions.plugin.mc17) { - if (player.getGameMode() == GameMode.SPECTATOR) { - continue; - } - } - - if (FPlayers.getInstance().getByPlayer(player).isVanished()) { - // Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation. - // But we can keep it as a config. - if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enable-While-Vanished")) { - return; - } + FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player); + if (fPlayer == null) { continue; } - if (SavageFactions.plugin.useNonPacketParticles) { - // 1.9+ based servers will use the built in particleAPI instead of packet based. - // any particle amount higher than 0 made them go everywhere, and the offset at 0 was not working. - // So setting the amount to 0 spawns 1 in the precise location - player.getWorld().spawnParticle(Particle.CLOUD, player.getLocation().add(0, -0.35, 0), 0); - } else { - ParticleEffect.CLOUD.display((float) 0, (float) 0, (float) 0, (float) 0, 3, player.getLocation().add(0, -0.35, 0), 16); + if (player.getGameMode() == GameMode.CREATIVE) { + continue; } - - } - if (flyMap.keySet().size() == 0) { - Bukkit.getScheduler().cancelTask(id); - id = -1; - } - } - }, 10L, 3L); - } - - public static void startFlyCheck() { - flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() throws ConcurrentModificationException { //threw the exception for now, until I recode fly :( Cringe. - checkTaskState(); - if (flyMap.keySet().size() != 0) { - for (String name : flyMap.keySet()) { - if (name == null) { - continue; - } - Player player = Bukkit.getPlayer(name); - if (player == null) { - continue; - } - if (!player.isFlying()) { - continue; - } - FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player); - if (fPlayer == null) { - continue; - } - if (player.getGameMode() == GameMode.CREATIVE) { - continue; - } - if (!SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) { - continue; - } - Faction myFaction = fPlayer.getFaction(); - if (myFaction.isWilderness()) { + if (!SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) { + continue; + } + Faction myFaction = fPlayer.getFaction(); + if (myFaction.isWilderness()) { + fPlayer.setFlying(false); + flyMap.remove(name); + continue; + } + if (fPlayer.checkIfNearbyEnemies()) { + continue; + } + FLocation myFloc = new FLocation(player.getLocation()); + Faction toFac = Board.getInstance().getFactionAt(myFloc); + if (Board.getInstance().getFactionAt(myFloc) != myFaction) { + if (!checkBypassPerms(fPlayer, player, toFac)) { fPlayer.setFlying(false); flyMap.remove(name); continue; } - if (fPlayer.checkIfNearbyEnemies()) { - continue; - } - FLocation myFloc = new FLocation(player.getLocation()); - Faction toFac = Board.getInstance().getFactionAt(myFloc); - if (Board.getInstance().getFactionAt(myFloc) != myFaction) { - if (!checkBypassPerms(fPlayer, player, toFac)) { - fPlayer.setFlying(false); - flyMap.remove(name); - continue; - } - } - } - } + } } + }, 20L, 20L); } @@ -226,20 +220,17 @@ public class CmdFly extends FCommand { if (fme.canFlyAtLocation()) - this.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", new Runnable() { - @Override - public void run() { - fme.setFlying(true); - flyMap.put(player.getName(), true); - if (id == -1) { - if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) { - startParticles(); - } - } - if (flyid == -1) { - startFlyCheck(); + this.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> { + fme.setFlying(true); + flyMap.put(player.getName(), true); + if (id == -1) { + if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) { + startParticles(); } } + if (flyid == -1) { + startFlyCheck(); + } }, this.p.getConfig().getLong("warmups.f-fly", 0)); } From be3eaba002a6f9ae44952125aca2c7e9bd10338e Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 31 Mar 2019 01:06:21 -0400 Subject: [PATCH 06/10] Fixed Obsidian Bug --- .../factions/listeners/FactionsEntityListener.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index e7651f05..13330cfa 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -256,11 +256,7 @@ public class FactionsEntityListener implements Listener { } // Cancel the event if no block will explode - if (event.blockList().isEmpty()) { - event.setCancelled(true); - - // Or handle the exploit of TNT in water/lava - } else if ((boomer instanceof TNTPrimed || boomer instanceof ExplosiveMinecart) && Conf.handleExploitTNTWaterlog) { + if (!event.blockList().isEmpty() && (boomer instanceof TNTPrimed || boomer instanceof ExplosiveMinecart) && Conf.handleExploitTNTWaterlog) { // TNT in water/lava doesn't normally destroy any surrounding blocks, which is usually desired behavior, but... // this change below provides workaround for waterwalling providing perfect protection, // and makes cheap (non-obsidian) TNT cannons require minor maintenance between shots From 18d3c4ec4ad9ca4ab6ba8ae46341c0ec2da7b0c7 Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 31 Mar 2019 18:24:26 -0400 Subject: [PATCH 07/10] Fixed F Admin Bug --- .../java/com/massivecraft/factions/cmd/CmdAdmin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java index 5c03529f..7ca6c7cb 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java @@ -34,7 +34,7 @@ public class CmdAdmin extends FCommand { @Override public void perform() { FPlayer fyou = this.argAsBestFPlayerMatch(0); - if (fyou == null) { + if (fyou == null || fyou.getFaction().isWarZone() || fyou.getFaction().isWilderness() || fyou.getFaction().isSafeZone()) { return; } @@ -74,10 +74,10 @@ public class CmdAdmin extends FCommand { // if target player is currently admin, demote and replace him if (fyou == admin) { - targetFaction.promoteNewLeader(); - msg(TL.COMMAND_ADMIN_DEMOTES, fyou.describeTo(fme, true)); - fyou.msg(TL.COMMAND_ADMIN_DEMOTED, senderIsConsole ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(fyou, true)); - return; + targetFaction.promoteNewLeader(); + msg(TL.COMMAND_ADMIN_DEMOTES, fyou.describeTo(fme, true)); + fyou.msg(TL.COMMAND_ADMIN_DEMOTED, senderIsConsole ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(fyou, true)); + return; } // promote target player, and demote existing admin if one exists From e13c60843a79649371e3c3834692c6fe4b91fccd Mon Sep 17 00:00:00 2001 From: ProSavage Date: Mon, 1 Apr 2019 16:45:37 -0500 Subject: [PATCH 08/10] Added leader permission bypass for new access --- .../listeners/FactionsPlayerListener.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index d4b57787..8502fd0f 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -18,7 +18,7 @@ import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.util.VisualizeUtil; import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.PermissableAction; -import com.massivecraft.factions.zcore.persist.*; +import com.massivecraft.factions.zcore.persist.MemoryFPlayer; import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TagUtil; import com.massivecraft.factions.zcore.util.TextUtil; @@ -40,7 +40,6 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryDragEvent; import org.bukkit.event.player.*; -import org.bukkit.util.NumberConversions; import java.util.*; import java.util.logging.Level; @@ -891,25 +890,27 @@ public class FactionsPlayerListener implements Listener { /// The World location where the action is being executed /// The faction of the player being checked /// The current's faction access permission for the action - private static boolean CheckPlayerAccess(Player player, FPlayer me, FLocation loc, Faction myFaction, Access access, PermissableAction action, boolean pain) { + private static boolean CheckPlayerAccess(Player player, FPlayer me, FLocation loc, Faction factionToCheck, Access access, PermissableAction action, boolean pain) { boolean doPain = pain && Conf.handleExploitInteractionSpam; if (access != null && access != Access.UNDEFINED) { // TODO: Update this once new access values are added other than just allow / deny. - boolean landOwned = (myFaction.doesLocationHaveOwnersSet(loc) && !myFaction.getOwnerList(loc).isEmpty()); - if ((landOwned && myFaction.getOwnerListString(loc).contains(player.getName())) || (me.getRole() == Role.LEADER && me.getFactionId().equals(myFaction.getId()))) return true; - else if (landOwned && !myFaction.getOwnerListString(loc).contains(player.getName())) { - me.msg("You can't do that in this territory, it is owned by: " + myFaction.getOwnerListString(loc)); + boolean landOwned = (factionToCheck.doesLocationHaveOwnersSet(loc) && !factionToCheck.getOwnerList(loc).isEmpty()); + if ((landOwned && factionToCheck.getOwnerListString(loc).contains(player.getName())) || (me.getRole() == Role.LEADER && me.getFactionId().equals(factionToCheck.getId()))) + return true; + else if (landOwned && !factionToCheck.getOwnerListString(loc).contains(player.getName())) { + me.msg("You can't do that in this territory, it is owned by: " + factionToCheck.getOwnerListString(loc)); if (doPain) { player.damage(Conf.actionDeniedPainAmount); } return false; } else if (!landOwned && access == Access.ALLOW) return true; else { - me.msg("You cannot " + action + " in the territory of " + myFaction.getTag(me.getFaction())); + me.msg("You cannot " + action + " in the territory of " + factionToCheck.getTag(me.getFaction())); return false; } } - me.msg("You cannot " + action + " in the territory of " + myFaction.getTag(me.getFaction())); + if (me.getRole().equals(Role.LEADER) && me.getFaction().equals(factionToCheck)) return true; + me.msg("You cannot " + action + " in the territory of " + factionToCheck.getTag(me.getFaction())); return false; } /// From a367d73dae8a1a62dc9a0035e63936b71f53e4d2 Mon Sep 17 00:00:00 2001 From: ProSavage Date: Mon, 1 Apr 2019 16:52:04 -0500 Subject: [PATCH 09/10] Fixed item build method for perm menu, used multiversion material check on runtime along with startup. --- src/main/java/com/massivecraft/factions/struct/Relation.java | 3 ++- src/main/java/com/massivecraft/factions/struct/Role.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/struct/Relation.java b/src/main/java/com/massivecraft/factions/struct/Relation.java index 66d6039f..e36498f4 100644 --- a/src/main/java/com/massivecraft/factions/struct/Relation.java +++ b/src/main/java/com/massivecraft/factions/struct/Relation.java @@ -2,6 +2,7 @@ package com.massivecraft.factions.struct; import com.massivecraft.factions.Conf; import com.massivecraft.factions.SavageFactions; +import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.zcore.fperms.Permissable; import com.massivecraft.factions.zcore.util.TL; import org.bukkit.ChatColor; @@ -203,7 +204,7 @@ public enum Relation implements Permissable { String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", "")); List lore = new ArrayList<>(); - Material material = Material.matchMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase())); + Material material = MultiversionMaterials.fromString(RELATION_CONFIG.getString("materials." + name().toLowerCase())).parseMaterial(); if (material == null) { return null; } diff --git a/src/main/java/com/massivecraft/factions/struct/Role.java b/src/main/java/com/massivecraft/factions/struct/Role.java index 226e912e..38bd3fa8 100644 --- a/src/main/java/com/massivecraft/factions/struct/Role.java +++ b/src/main/java/com/massivecraft/factions/struct/Role.java @@ -2,6 +2,7 @@ package com.massivecraft.factions.struct; import com.massivecraft.factions.Conf; import com.massivecraft.factions.SavageFactions; +import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.zcore.fperms.Permissable; import com.massivecraft.factions.zcore.util.TL; import org.bukkit.ChatColor; @@ -117,7 +118,7 @@ public enum Role implements Permissable { String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", "")); List lore = new ArrayList<>(); - Material material = Material.matchMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY")); + Material material = MultiversionMaterials.fromString(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY")).parseMaterial(); if (material == null) { return null; } From 98dd9a787d06daf313f2b84b7a77c98f54ca2d28 Mon Sep 17 00:00:00 2001 From: ProSavage Date: Mon, 1 Apr 2019 16:57:50 -0500 Subject: [PATCH 10/10] F upgrades null pointer fixed by utilizing MultiversionMaterials. --- src/main/java/com/massivecraft/factions/SavageFactions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/SavageFactions.java b/src/main/java/com/massivecraft/factions/SavageFactions.java index 2002c88e..1d89c9c7 100644 --- a/src/main/java/com/massivecraft/factions/SavageFactions.java +++ b/src/main/java/com/massivecraft/factions/SavageFactions.java @@ -496,7 +496,7 @@ public class SavageFactions extends MPlugin { } public ItemStack createItem(Material material, int amount, short datavalue, String name, List lore) { - ItemStack item = new ItemStack(material, amount, datavalue); + ItemStack item = new ItemStack(MultiversionMaterials.fromString(material.toString()).parseMaterial(), amount, datavalue); ItemMeta meta = item.getItemMeta(); meta.setDisplayName(color(name)); meta.setLore(colorList(lore));