Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-08 01:08:23 +01:00
Code Issues Projects Releases Wiki Activity

Version up and some cleanup

Browse Source
This commit is contained in:
Zrips 2020-05-06 17:56:50 +03:00
parent 8288c83d00
commit d056dc8ecf
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gamingmesh/jobs/CMILib/RawMessage.java
View File

@ -516,13 +516,10 @@ public class RawMessage {
if (!player.isOnline()) if (!player.isOnline())
return this; return this;
// CMI.getInstance().d("|" + combined + "|");
if (softCombined) { if (softCombined) {
for (String one : softCombine()) { for (String one : softCombine()) {
if (one.isEmpty()) if (one.isEmpty())
continue; continue;
// CMI.getInstance().d("=" + one + "=");
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + player.getName() + " " + one); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + player.getName() + " " + one);
} }
} else { } else {

3
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -1022,7 +1022,8 @@ public class PlayerManager {
boost.add(BoostOf.Dynamic, new BoostMultiplier().add(prog.getBonus())); boost.add(BoostOf.Dynamic, new BoostMultiplier().add(prog.getBonus()));
// boost.add(BoostOf.Item, Jobs.getPlayerManager().getItemBoost(player.getPlayer(), prog)); // boost.add(BoostOf.Item, Jobs.getPlayerManager().getItemBoost(player.getPlayer(), prog));
boost.add(BoostOf.Item, getItemBoostNBT(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; return boost;
} }

1
src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java
View File

@ -174,7 +174,6 @@ public class BlockProtectionManager {
public Integer getBlockDelayTime(Block block) { public Integer getBlockDelayTime(Block block) {
Integer time = Jobs.getRestrictedBlockManager().restrictedBlocksTimer.get(CMIMaterial.get(block)); Integer time = Jobs.getRestrictedBlockManager().restrictedBlocksTimer.get(CMIMaterial.get(block));
if (time == null && Jobs.getGCManager().useGlobalTimer) { if (time == null && Jobs.getGCManager().useGlobalTimer) {
Debug.D("using global " + block.getType());
time = Jobs.getGCManager().globalblocktimer; time = Jobs.getGCManager().globalblocktimer;
} }
return time; return time;

5
src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
View File

@ -40,7 +40,6 @@ import com.gamingmesh.jobs.container.CurrencyLimit;
import com.gamingmesh.jobs.container.CurrencyType; import com.gamingmesh.jobs.container.CurrencyType;
import com.gamingmesh.jobs.container.Schedule; import com.gamingmesh.jobs.container.Schedule;
import com.gamingmesh.jobs.resources.jfep.Parser; import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.Debug;
public class GeneralConfigManager { public class GeneralConfigManager {
public List<Integer> BroadcastingLevelUpLevels = new ArrayList<>(); public List<Integer> BroadcastingLevelUpLevels = new ArrayList<>();
@ -343,9 +342,6 @@ public class GeneralConfigManager {
} }
public boolean canPerformActionInWorld(World world) { public boolean canPerformActionInWorld(World world) {
if (world == null || !DisabledWorldsUse)
return true;
return canPerformActionInWorld(world.getName()); return canPerformActionInWorld(world.getName());
} }
@ -613,7 +609,6 @@ public class GeneralConfigManager {
whiteListedItems.put(mat, submap); 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."); 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); modifyChat = c.get("modify-chat.use", false);