diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/RawMessage.java b/src/main/java/com/gamingmesh/jobs/CMILib/RawMessage.java index 0b878ab4..34d614f7 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/RawMessage.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/RawMessage.java @@ -516,13 +516,10 @@ public class RawMessage { if (!player.isOnline()) return this; -// CMI.getInstance().d("|" + combined + "|"); - if (softCombined) { for (String one : softCombine()) { if (one.isEmpty()) continue; -// CMI.getInstance().d("=" + one + "="); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + player.getName() + " " + one); } } else { diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java index 2032bb88..f0343050 100644 --- a/src/main/java/com/gamingmesh/jobs/Jobs.java +++ b/src/main/java/com/gamingmesh/jobs/Jobs.java @@ -949,7 +949,7 @@ public class Jobs extends JavaPlugin { JobInfo jobinfo = prog.getJob().getJobInfo(info, level); checkDailyQuests(jPlayer, prog.getJob(), info); - + if (jobinfo == null) continue; diff --git a/src/main/java/com/gamingmesh/jobs/PlayerManager.java b/src/main/java/com/gamingmesh/jobs/PlayerManager.java index b32b14de..77f2b60a 100644 --- a/src/main/java/com/gamingmesh/jobs/PlayerManager.java +++ b/src/main/java/com/gamingmesh/jobs/PlayerManager.java @@ -1022,7 +1022,8 @@ public class PlayerManager { boost.add(BoostOf.Dynamic, new BoostMultiplier().add(prog.getBonus())); // boost.add(BoostOf.Item, Jobs.getPlayerManager().getItemBoost(player.getPlayer(), prog)); boost.add(BoostOf.Item, getItemBoostNBT(player.getPlayer(), prog)); - boost.add(BoostOf.Area, new BoostMultiplier().add(Jobs.getRestrictedAreaManager().getRestrictedMultiplier(player.getPlayer()))); + if (!Jobs.getRestrictedAreaManager().getRestrictedAres().isEmpty()) + boost.add(BoostOf.Area, new BoostMultiplier().add(Jobs.getRestrictedAreaManager().getRestrictedMultiplier(player.getPlayer()))); return boost; } diff --git a/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java b/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java index c67bde72..240a0686 100644 --- a/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java @@ -174,7 +174,6 @@ public class BlockProtectionManager { public Integer getBlockDelayTime(Block block) { Integer time = Jobs.getRestrictedBlockManager().restrictedBlocksTimer.get(CMIMaterial.get(block)); if (time == null && Jobs.getGCManager().useGlobalTimer) { - Debug.D("using global " + block.getType()); time = Jobs.getGCManager().globalblocktimer; } return time; diff --git a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java index 1cc36aa5..e22638f8 100644 --- a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java @@ -40,7 +40,6 @@ import com.gamingmesh.jobs.container.CurrencyLimit; import com.gamingmesh.jobs.container.CurrencyType; import com.gamingmesh.jobs.container.Schedule; import com.gamingmesh.jobs.resources.jfep.Parser; -import com.gamingmesh.jobs.stuff.Debug; public class GeneralConfigManager { public List BroadcastingLevelUpLevels = new ArrayList<>(); @@ -343,9 +342,6 @@ public class GeneralConfigManager { } public boolean canPerformActionInWorld(World world) { - if (world == null || !DisabledWorldsUse) - return true; - return canPerformActionInWorld(world.getName()); } @@ -610,10 +606,9 @@ public class GeneralConfigManager { HashMap submap = new HashMap(); if (enchant != null) submap.put(enchant, level); - + whiteListedItems.put(mat, submap); } - Debug.D("Loaded materials ",whiteListedItems.size()); c.addComment("modify-chat", "Modifys chat to add chat titles. If you're using a chat manager, you may add the tag {jobs} to your chat format and disable this."); modifyChat = c.get("modify-chat.use", false);