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

Fix for registered furnaces reassign value not increased

Browse Source 
Fixes #903
This commit is contained in:
montlikadani 2020-09-09 19:38:43 +02:00
parent 54fde9353f
commit 78c6368c09
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -1228,13 +1228,13 @@ public class JobsPlayer {
Double maxV = Jobs.getPermissionManager().getMaxPermission(this, perm); Double maxV = Jobs.getPermissionManager().getMaxPermission(this, perm);
if (maxV == 0 && (type == CMIMaterial.FURNACE || type == CMIMaterial.LEGACY_BURNING_FURNACE)) if (maxV == 0D && (type == CMIMaterial.FURNACE || type == CMIMaterial.LEGACY_BURNING_FURNACE))
maxV = (double) Jobs.getGCManager().getFurnacesMaxDefault(); maxV = (double) Jobs.getGCManager().getFurnacesMaxDefault();
if (maxV == 0 && type == CMIMaterial.BLAST_FURNACE) if (maxV == 0D && type == CMIMaterial.BLAST_FURNACE)
maxV = (double) Jobs.getGCManager().BlastFurnacesMaxDefault; maxV = (double) Jobs.getGCManager().BlastFurnacesMaxDefault;
if (maxV == 0 && type == CMIMaterial.SMOKER) if (maxV == 0D && type == CMIMaterial.SMOKER)
maxV = (double) Jobs.getGCManager().SmokersMaxDefault; maxV = (double) Jobs.getGCManager().SmokersMaxDefault;
return maxV.intValue(); return maxV.intValue();

2
src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java
View File

@ -267,7 +267,7 @@ public class FurnaceBrewingHandling {
block.setMetadata(JobsPaymentListener.furnaceOwnerMetadata, new FixedMetadataValue(Jobs.getInstance(), player.getUniqueId().toString())); block.setMetadata(JobsPaymentListener.furnaceOwnerMetadata, new FixedMetadataValue(Jobs.getInstance(), player.getUniqueId().toString()));
if (!Jobs.getGCManager().isFurnacesReassign() || !Jobs.getGCManager().BlastFurnacesReassign || !Jobs.getGCManager().SmokerReassign) { if (!Jobs.getGCManager().isFurnacesReassign() && !Jobs.getGCManager().BlastFurnacesReassign && !Jobs.getGCManager().SmokerReassign) {
return ownershipFeedback.newReg; return ownershipFeedback.newReg;
} }

2
src/main/resources/jobConfig.yml
View File

@ -733,7 +733,6 @@ Jobs:
ChatColour: DARK_GRAY ChatColour: DARK_GRAY
chat-display: full chat-display: full
max-level: 200 max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4) leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(baseincome*(joblevel-1)*0.01)) * ((numjobs-1)*0.05)) income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(baseincome*(joblevel-1)*0.01)) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(basepoints*(joblevel-1)*0.01)) * ((numjobs-1)*0.05)) points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(basepoints*(joblevel-1)*0.01)) * ((numjobs-1)*0.05))
@ -3139,7 +3138,6 @@ Jobs:
ChatColour: DARK_BLUE ChatColour: DARK_BLUE
chat-display: full chat-display: full
max-level: 200 max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4) leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(baseincome*(joblevel-1)*0.01)) * ((numjobs-1)*0.05)) income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(baseincome*(joblevel-1)*0.01)) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(basepoints*(joblevel-1)*0.01)) * ((numjobs-1)*0.05)) points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(basepoints*(joblevel-1)*0.01)) * ((numjobs-1)*0.05))