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

Fix for Green Terra not planting wheat.

Browse Source
This commit is contained in:
nossr50 2012-02-14 14:27:05 -08:00
parent c45b03b1d8
commit 877bf7905b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -169,7 +169,7 @@ public class mcBlockListener implements Listener
//Wheat && Triple drops //Wheat && Triple drops
if(PP.getGreenTerraMode() && Herbalism.canBeGreenTerra(block)) if(PP.getGreenTerraMode() && Herbalism.canBeGreenTerra(block))
{ {
Herbalism.herbalismProcCheck(block, player, event, plugin); Herbalism.herbalismProcCheck(block, player, event, plugin, true);
Herbalism.greenTerraWheat(player, block, event, plugin); Herbalism.greenTerraWheat(player, block, event, plugin);
} }
@ -275,8 +275,9 @@ public class mcBlockListener implements Listener
{ {
Herbalism.greenTerraCheck(player, block); Herbalism.greenTerraCheck(player, block);
} }
if(mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5) if(mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5)
Herbalism.herbalismProcCheck(block, player, event, plugin); Herbalism.herbalismProcCheck(block, player, event, plugin, false);
//Change the byte back when broken //Change the byte back when broken
if(block.getData() == 5 && m.shouldBeWatched(block)) if(block.getData() == 5 && m.shouldBeWatched(block))
@ -287,6 +288,8 @@ public class mcBlockListener implements Listener
plugin.misc.blockWatchList.remove(block); plugin.misc.blockWatchList.remove(block);
} }
} }
//System.out.println("DEBUG: "+event.isCancelled()+", BLOCK_TYPE: "+event.getBlock().getType().toString()+", BLOCK_DATA: "+event.getBlock().getData());
} }
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)

12
src/main/java/com/gmail/nossr50/skills/Herbalism.java
View File

@ -72,6 +72,7 @@ public class Herbalism
} }
} }
public static void greenTerraWheat(Player player, Block block, BlockBreakEvent event, mcMMO plugin) public static void greenTerraWheat(Player player, Block block, BlockBreakEvent event, mcMMO plugin)
{ {
if(block.getType() == Material.WHEAT && block.getData() == (byte) 0x07) if(block.getType() == Material.WHEAT && block.getData() == (byte) 0x07)
@ -89,8 +90,8 @@ public class Herbalism
is = new ItemStack(mat, 1, (byte)0, (byte)0); is = new ItemStack(mat, 1, (byte)0, (byte)0);
m.mcDropItem(loc, is); m.mcDropItem(loc, is);
herbalismProcCheck(block, player, event, plugin); herbalismProcCheck(block, player, event, plugin, true);
herbalismProcCheck(block, player, event, plugin); herbalismProcCheck(block, player, event, plugin, true);
block.setData((byte) 0x03); block.setData((byte) 0x03);
} }
} }
@ -116,6 +117,7 @@ public class Herbalism
int t = block.getTypeId(); int t = block.getTypeId();
return t == 103 || t == 4 || t == 3 || t == 59 || t == 81 || t == 83 || t == 91 || t == 86 || t == 39 || t == 46 || t == 37 || t == 38; return t == 103 || t == 4 || t == 3 || t == 59 || t == 81 || t == 83 || t == 91 || t == 86 || t == 39 || t == 46 || t == 37 || t == 38;
} }
public static boolean hasSeeds(Player player){ public static boolean hasSeeds(Player player){
ItemStack[] inventory = player.getInventory().getContents(); ItemStack[] inventory = player.getInventory().getContents();
for(ItemStack x : inventory){ for(ItemStack x : inventory){
@ -125,6 +127,7 @@ public class Herbalism
} }
return false; return false;
} }
public static void removeSeeds(Player player){ public static void removeSeeds(Player player){
ItemStack[] inventory = player.getInventory().getContents(); ItemStack[] inventory = player.getInventory().getContents();
for(ItemStack x : inventory){ for(ItemStack x : inventory){
@ -141,7 +144,8 @@ public class Herbalism
} }
} }
} }
public static void herbalismProcCheck(Block block, Player player, BlockBreakEvent event, mcMMO plugin)
public static void herbalismProcCheck(Block block, Player player, BlockBreakEvent event, mcMMO plugin, boolean isGreenTerra)
{ {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
int herbLevel = PP.getSkillLevel(SkillType.HERBALISM); int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
@ -167,7 +171,7 @@ public class Herbalism
m.mcDropItem(loc, is); m.mcDropItem(loc, is);
} }
//GREEN THUMB //GREEN THUMB
if(herbLevel > 1500 || (Math.random() * 1500 <= herbLevel)) if(!isGreenTerra && (herbLevel > 1500 || (Math.random() * 1500 <= herbLevel)))
{ {
event.setCancelled(true); event.setCancelled(true);
m.mcDropItem(loc, is); m.mcDropItem(loc, is);