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

CMIMaterial is always not null

Browse Source
This commit is contained in:
Zrips 2018-08-03 15:07:50 +03:00
parent 6354efab91
commit fbe92bedf4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.CMILib.ItemManager.CMIEntityType;
import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial;
import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.BoostMultiplier;
@ -856,7 +857,7 @@ public class ConfigManager {
if (actionType == ActionType.EXPLORE)
material = null;
c: if (material != null) {
c: if (material != null && material.getMaterial() != null) {
// Need to include thos ones and count as regular blocks
switch (key.replace("_", "").toLowerCase()) {
@ -910,17 +911,17 @@ public class ConfigManager {
} else if (actionType == ActionType.KILL || actionType == ActionType.TAME || actionType == ActionType.BREED || actionType == ActionType.MILK) {
// check entities
EntityType entity = EntityType.fromName(key);
if (entity == null) {
try {
entity = EntityType.valueOf(key.toUpperCase());
} catch (IllegalArgumentException e) {
}
}
CMIEntityType entity = CMIEntityType.getByName(key);
// if (entity == null) {
// try {
// entity = EntityType.valueOf(key.toUpperCase());
// } catch (IllegalArgumentException e) {
// }
// }
if (entity != null && entity.isAlive()) {
type = entity.toString();
id = entity.getTypeId();
id = entity.getId();
// using breeder finder
if (actionType == ActionType.BREED)

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

@ -1,7 +1,7 @@
name: Jobs
description: Jobs Plugin for the BukkitAPI
main: com.gamingmesh.jobs.Jobs
version: 4.6.0
version: 4.6.1
api-version: 1.13
website: https://www.spigotmc.org/resources/jobs-reborn.4216/
author: phrstbrn