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

Block protection change by wysohn to resolve some current issues

Browse Source
This commit is contained in:
Zrips 2017-05-11 17:20:36 +03:00
parent c83000c7db
commit e0f2ffb25f
1 changed files with 23 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
com/gamingmesh/jobs/Jobs.java
View File

@ -754,7 +754,7 @@ public class Jobs extends JavaPlugin {
} }
setMyPetManager(); setMyPetManager();
setMythicManager(); setMythicManager();
if (MythicManager.Check() && GconfigManager.MythicMobsEnabled) { if (MythicManager.Check() && GconfigManager.MythicMobsEnabled) {
MythicManager.registerListener(); MythicManager.registerListener();
@ -842,7 +842,7 @@ public class Jobs extends JavaPlugin {
if (jobinfo == null) if (jobinfo == null)
return; return;
if (!isBpOk(jPlayer.getPlayer(), info.getType(), block, true)) if (!isBpOk(jPlayer, info, block))
return; return;
Double income = jobinfo.getIncome(1, numjobs); Double income = jobinfo.getIncome(1, numjobs);
@ -910,7 +910,7 @@ public class Jobs extends JavaPlugin {
if (jobinfo == null) if (jobinfo == null)
continue; continue;
if (!isBpOk(jPlayer.getPlayer(), info.getType(), block, true)) if (!isBpOk(jPlayer, info, block))
return; return;
Double income = jobinfo.getIncome(level, numjobs); Double income = jobinfo.getIncome(level, numjobs);
Double pointAmount = jobinfo.getPoints(level, numjobs); Double pointAmount = jobinfo.getPoints(level, numjobs);
@ -1039,65 +1039,44 @@ public class Jobs extends JavaPlugin {
if (prog.addExperience(expAmount)) if (prog.addExperience(expAmount))
pManager.performLevelUp(jPlayer, prog.getJob(), oldLevel); pManager.performLevelUp(jPlayer, prog.getJob(), oldLevel);
} }
//need to update bp
BlockProtection bp = BpManager.getBp(block.getLocation());
if (bp != null)
bp.setPaid(true);
} }
} }
private static boolean isBpOk(Player player, ActionType type, Block block, boolean inform) { private static boolean isBpOk(JobsPlayer jPlayer, ActionInfo info, Block block) {
if (block != null && Jobs.getGCManager().useBlockProtection) { if (block != null && Jobs.getGCManager().useBlockProtection) {
if (type == ActionType.BREAK) { if (info.getType() == ActionType.BREAK || info.getType() == ActionType.PLACE) {
BlockProtection bp = Jobs.getBpManager().getBp(block.getLocation()); BlockProtection bp = Jobs.getBpManager().getBp(block.getLocation());
if (bp != null) { if (bp != null) {
Long time = bp.getTime(); Long time = bp.getTime();
if (time == -1) if (time == -1)
return false; return false;
Integer cd = Jobs.getBpManager().getBlockDelayTime(block); Integer cd = Jobs.getBpManager().getBlockDelayTime(block);
if (time < System.currentTimeMillis() && bp.getAction() != DBAction.DELETE) { if (time > System.currentTimeMillis() && bp.isPaid() && bp.getAction() != DBAction.DELETE) {
Jobs.getBpManager().remove(block);
return true;
}
if ((time > System.currentTimeMillis() || bp.isPaid()) && bp.getAction() != DBAction.DELETE) {
int sec = Math.round((time - System.currentTimeMillis()) / 1000); int sec = Math.round((time - System.currentTimeMillis()) / 1000);
if (inform) Jobs.getActionBar().send(jPlayer.getPlayer(),
Jobs.getActionBar().send(player, Jobs.getLanguage().getMessage("message.blocktimer", "[time]", sec)); Jobs.getLanguage().getMessage("message.blocktimer", "[time]", sec));
return false; return false;
} }
//timer expired + already paid
Jobs.getBpManager().add(block, cd); else if (bp.isPaid()) {
if (cd == null) { Jobs.getBpManager().remove(block);
if (Jobs.getGCManager().useGlobalTimer) {
Jobs.getBpManager().add(block, System.currentTimeMillis() + (Jobs.getGCManager().globalblocktimer * 1000));
}
} }
} else {
if (Jobs.getGCManager().useGlobalTimer) { if (cd != null) {
Jobs.getBpManager().add(block, System.currentTimeMillis() + (Jobs.getGCManager().globalblocktimer * 1000)); Jobs.getBpManager().add(block,
System.currentTimeMillis() + (Jobs.getGCManager().globalblocktimer * 1000));
} else {
Jobs.getBpManager().add(block, cd);
} }
} }
} else if (type == ActionType.PLACE) {
BlockProtection bp = Jobs.getBpManager().getBp(block.getLocation());
if (bp != null) {
Long time = bp.getTime();
if (time != -1) {
if (time < System.currentTimeMillis() && bp.getAction() != DBAction.DELETE) {
Jobs.getBpManager().remove(block);
return true;
}
if ((time > System.currentTimeMillis() || bp.isPaid()) && bp.getAction() != DBAction.DELETE) {
int sec = Math.round((time - System.currentTimeMillis()) / 1000);
if (inform)
Jobs.getActionBar().send(player, Jobs.getLanguage().getMessage("message.blocktimer", "[time]", sec));
return false;
}
} else if (bp.isPaid()) {
if (bp.getTime() == -1 && Jobs.getBpManager().getBlockDelayTime(block) != null && Jobs.getBpManager().getBlockDelayTime(block) == -1)
return false;
}
} else
Jobs.getBpManager().add(block, Jobs.getBpManager().getBlockDelayTime(block));
} }
} }
return true; return true;