Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 18:47:57 +01:00
Code Issues Projects Releases Wiki Activity

Herbalism was the one that actually needed to remain blockdata.

Browse Source
This commit is contained in:
t00thpick1 2018-10-13 17:06:54 -04:00
parent 4bdd97a302
commit d778616b2c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@ -172,7 +172,7 @@ public final class BlockUtils {
* @return true if the block should affected by Green Terra, false otherwise * @return true if the block should affected by Green Terra, false otherwise
*/ */
public static boolean affectedByGreenTerra(BlockState blockState) { public static boolean affectedByGreenTerra(BlockState blockState) {
if (ExperienceConfig.getInstance().isSkillBlock(SkillType.HERBALISM, blockState.getType())) { if (ExperienceConfig.getInstance().isSkillBlock(SkillType.HERBALISM, blockState.getBlockData())) {
return true; return true;
} }
@ -362,6 +362,8 @@ public final class BlockUtils {
if (data instanceof Ageable) if (data instanceof Ageable)
{ {
Ageable ageable = (Ageable) data; Ageable ageable = (Ageable) data;
mcMMO.p.debug(ageable.getAge() + "/" + ageable.getMaximumAge());
System.out.println(ageable.getAge() + "/" + ageable.getMaximumAge());
return ageable.getAge() == ageable.getMaximumAge(); return ageable.getAge() == ageable.getMaximumAge();
} }
return true; return true;

3
src/main/java/com/gmail/nossr50/util/StringUtils.java
View File

@ -6,8 +6,8 @@ import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeSpecies; import org.bukkit.TreeSpecies;
import org.bukkit.block.data.Ageable; import org.bukkit.block.data.Ageable;
import org.bukkit.entity.EntityType;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.entity.EntityType;
public class StringUtils { public class StringUtils {
@ -48,6 +48,7 @@ public class StringUtils {
public static String getFriendlyConfigBlockDataString(BlockData data) { public static String getFriendlyConfigBlockDataString(BlockData data) {
switch(data.getMaterial()){ switch(data.getMaterial()){
case CHORUS_FLOWER:
case COCOA: case COCOA:
case WHEAT: case WHEAT:
case BEETROOTS: case BEETROOTS:

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

@ -162,7 +162,7 @@ Experience:
Brown_Mushroom: 150 Brown_Mushroom: 150
Cactus: 30 Cactus: 30
Carrots_Ripe: 50 Carrots_Ripe: 50
Chorus_Flower: 25 Chorus_Flower_Ripe: 25
Chorus_Plant: 1 Chorus_Plant: 1
Cocoa_Ripe: 30 Cocoa_Ripe: 30
Wheat_Ripe: 50 Wheat_Ripe: 50