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

Lets keep subtype in 1.13

Browse Source
This commit is contained in:
Zrips 2018-10-14 17:02:14 +03:00
parent 99f13e5c47
commit e2e3bdbbda
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java
View File

@ -21,10 +21,8 @@ package com.gamingmesh.jobs.actions;
import org.bukkit.Material;
import org.bukkit.block.Block;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.container.ActionInfo;
import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
public class BlockActionInfo extends MaterialActionInfo implements ActionInfo {
public BlockActionInfo(Block block, ActionType type) {
@ -32,8 +30,6 @@ public class BlockActionInfo extends MaterialActionInfo implements ActionInfo {
}
private static byte getData(Block block) {
if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1))
return 0;
@SuppressWarnings("deprecation")
byte data = block.getData();
if (block.getType() == Material.COCOA)

31
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -1125,37 +1125,6 @@ public class ConfigManager {
}
}
switch (actionType) {
case BREED:
case CUSTOMKILL:
case BREW:
case EXPLORE:
case FISH:
case KILL:
case MILK:
case MMKILL:
case SHEAR:
case TAME:
break;
case TNTBREAK:
case SMELT:
case REPAIR:
case PLACE:
case ENCHANT:
case DYE:
case EAT:
case DRINK:
case CRAFT:
case BREAK:
if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) {
subType = "";
meta = "";
}
break;
default:
break;
}
jobInfo.add(new JobInfo(actionType, id, meta, type + subType, income, incomeEquation, experience, expEquation, pointsEquation, points, fromlevel,
untilLevel, section.getCurrentPath(), softIncomeLimit, softExpLimit, softPointsLimit));
}