EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-30 00:56:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2801 from DorCoMaNdO/master

Browse Source 
Chorus plant experience reward is now 1 instead of 2.
This commit is contained in:
t00thpick1 2016-03-11 22:38:46 -05:00
commit 898fad6be4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -528,6 +528,10 @@ public class PlayerListener implements Listener {
switch (event.getAction()) { switch (event.getAction()) {
case RIGHT_CLICK_BLOCK: case RIGHT_CLICK_BLOCK:
if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) {
break;
}
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
BlockState blockState = block.getState(); BlockState blockState = block.getState();
@ -569,6 +573,10 @@ public class PlayerListener implements Listener {
break; break;
case RIGHT_CLICK_AIR: case RIGHT_CLICK_AIR:
if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) {
break;
}
/* ACTIVATION CHECKS */ /* ACTIVATION CHECKS */
if (Config.getInstance().getAbilitiesEnabled()) { if (Config.getInstance().getAbilitiesEnabled()) {
mcMMOPlayer.processAbilityActivation(SkillType.AXES); mcMMOPlayer.processAbilityActivation(SkillType.AXES);

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

@ -156,7 +156,7 @@ Experience:
Cactus: 30 Cactus: 30
Carrot: 50 Carrot: 50
Chorus_Flower: 25 Chorus_Flower: 25
Chorus_Plant: 2 Chorus_Plant: 1
Cocoa: 30 Cocoa: 30
Crops: 50 Crops: 50
Dead_Bush: 30 Dead_Bush: 30