EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-16 17:13:38 +02:00
Code Issues Projects Releases Wiki Activity

Update herbalism permissions for new block names. Should fix replanting crops.

Browse Source
This commit is contained in:
t00thpick1 2018-09-14 22:44:21 -04:00
parent 184b98bbdc
commit e2edbaad34
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -287,6 +287,10 @@ public class HerbalismManager extends SkillManager {
seed = Material.BEETROOT_SEEDS; seed = Material.BEETROOT_SEEDS;
break; break;
case COCOA:
seed = Material.COCOA_BEANS;
break;
default: default:
return; return;
} }
@ -321,7 +325,6 @@ public class HerbalismManager extends SkillManager {
case POTATOES: case POTATOES:
case CARROTS: case CARROTS:
case WHEAT: case WHEAT:
crops = (Ageable) blockState.getBlockData();
if (greenTerra) { if (greenTerra) {
crops.setAge(3); crops.setAge(3);
@ -333,7 +336,6 @@ public class HerbalismManager extends SkillManager {
case BEETROOTS: case BEETROOTS:
case NETHER_WART: case NETHER_WART:
crops = (Ageable) blockState.getBlockData();
if (greenTerra || greenThumbStage > 2) { if (greenTerra || greenThumbStage > 2) {
crops.setAge(2); crops.setAge(2);
@ -347,7 +349,6 @@ public class HerbalismManager extends SkillManager {
break; break;
case COCOA: case COCOA:
crops = (Ageable) blockState.getBlockData();
if (greenTerra || getGreenThumbStage() > 1) { if (greenTerra || getGreenThumbStage() > 1) {
crops.setAge(1); crops.setAge(1);

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

@ -317,16 +317,19 @@ permissions:
description: Allows access to all Green Thumb abilities for blocks description: Allows access to all Green Thumb abilities for blocks
children: children:
mcmmo.ability.herbalism.greenthumb.blocks.cobblestone: true mcmmo.ability.herbalism.greenthumb.blocks.cobblestone: true
mcmmo.ability.herbalism.greenthumb.blocks.cobblewall: true mcmmo.ability.herbalism.greenthumb.blocks.cobblestone_wall: true
mcmmo.ability.herbalism.greenthumb.blocks.dirt: true mcmmo.ability.herbalism.greenthumb.blocks.dirt: true
mcmmo.ability.herbalism.greenthumb.blocks.smoothbrick: true mcmmo.ability.herbalism.greenthumb.blocks.grasspath: true
mcmmo.ability.herbalism.greenthumb.blocks.stonebricks: true
mcmmo.ability.herbalism.greenthumb.blocks.cobblestone: mcmmo.ability.herbalism.greenthumb.blocks.cobblestone:
description: Allows access to the Green Thumb ability for cobblestone description: Allows access to the Green Thumb ability for cobblestone
mcmmo.ability.herbalism.greenthumb.blocks.cobblewall: mcmmo.ability.herbalism.greenthumb.blocks.cobblestone_wall:
description: Allows access to the Green Thumb ability for cobblestone walls description: Allows access to the Green Thumb ability for cobblestone walls
mcmmo.ability.herbalism.greenthumb.blocks.dirt: mcmmo.ability.herbalism.greenthumb.blocks.dirt:
description: Allows access to the Green Thumb ability for dirt description: Allows access to the Green Thumb ability for dirt
mcmmo.ability.herbalism.greenthumb.blocks.smoothbrick: mcmmo.ability.herbalism.greenthumb.blocks.grasspath:
description: Allows access to the Green Thumb ability for grass path
mcmmo.ability.herbalism.greenthumb.blocks.stonebricks:
description: Allows access to the Green Thumb ability for smooth brick description: Allows access to the Green Thumb ability for smooth brick
mcmmo.ability.herbalism.greenthumb.plants.*: mcmmo.ability.herbalism.greenthumb.plants.*:
default: false default: false
@ -336,24 +339,24 @@ permissions:
mcmmo.ability.herbalism.greenthumb.plants.all: mcmmo.ability.herbalism.greenthumb.plants.all:
description: Allows access to all Green Thumb abilities for plants description: Allows access to all Green Thumb abilities for plants
children: children:
mcmmo.ability.herbalism.greenthumb.plants.carrot: true mcmmo.ability.herbalism.greenthumb.plants.carrots: true
mcmmo.ability.herbalism.greenthumb.plants.cocoa: true mcmmo.ability.herbalism.greenthumb.plants.cocoa: true
mcmmo.ability.herbalism.greenthumb.plants.crops: true mcmmo.ability.herbalism.greenthumb.plants.wheat: true
mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true mcmmo.ability.herbalism.greenthumb.plants.netherwart: true
mcmmo.ability.herbalism.greenthumb.plants.potato: true mcmmo.ability.herbalism.greenthumb.plants.potatoes: true
mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: true mcmmo.ability.herbalism.greenthumb.plants.beetroots: true
mcmmo.ability.herbalism.greenthumb.plants.carrot: mcmmo.ability.herbalism.greenthumb.plants.carrots:
description: Allows access to the Green Thumb ability for carrots description: Allows access to the Green Thumb ability for carrots
mcmmo.ability.herbalism.greenthumb.plants.cocoa: mcmmo.ability.herbalism.greenthumb.plants.cocoa:
description: Allows access to the Green Thumb ability for cocoa description: Allows access to the Green Thumb ability for cocoa
mcmmo.ability.herbalism.greenthumb.plants.crops: mcmmo.ability.herbalism.greenthumb.plants.wheat:
description: Allows access to the Green Thumb ability for wheat description: Allows access to the Green Thumb ability for wheat
mcmmo.ability.herbalism.greenthumb.plants.netherwarts: mcmmo.ability.herbalism.greenthumb.plants.netherwart:
description: Allows access to the Green Thumb ability for netherwart description: Allows access to the Green Thumb ability for netherwart
mcmmo.ability.herbalism.greenthumb.plants.potato: mcmmo.ability.herbalism.greenthumb.plants.potatoes:
description: Allows access to the Green Thumb ability for potatoes description: Allows access to the Green Thumb ability for potatoes
mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: mcmmo.ability.herbalism.greenthumb.plants.beetroots:
description: Allows access to the Green Thumb ability for beetrootes description: Allows access to the Green Thumb ability for beetroots
mcmmo.ability.herbalism.hylianluck: mcmmo.ability.herbalism.hylianluck:
description: Allows access to the Hylian Luck ability description: Allows access to the Hylian Luck ability
mcmmo.ability.herbalism.shroomthumb: mcmmo.ability.herbalism.shroomthumb: