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

Minor tweaks & fixes. Changed Tree Feller to use custom item drop method

Browse Source 
so we fire the event like we're supposed to.
This commit is contained in:
GJ 2012-02-24 11:21:07 -05:00
parent fb35e7dd5d
commit 1cd7181d26
3 changed files with 65 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,80 +60,59 @@ public class mcBlockListener implements Listener
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) public void onBlockPlace(BlockPlaceEvent event)
{ {
//Setup some basic vars //Setup some basic variables
Block block; Block block;
Player player = event.getPlayer(); Player player = event.getPlayer();
//When blocks are placed on snow this event reports the wrong block. //When blocks are placed on snow this event reports the wrong block.
if (event.getBlockReplacedState() != null && event.getBlockReplacedState().getTypeId() == 78) if (event.getBlockReplacedState() != null && event.getBlockReplacedState().getTypeId() == 78)
{
block = event.getBlockAgainst(); block = event.getBlockAgainst();
}
else else
{
block = event.getBlock(); block = event.getBlock();
}
int id = block.getTypeId();
//TNT placement checks - needed for Blast Mining //TNT placement checks - needed for Blast Mining
if(block.getTypeId() == 46 && mcPermissions.getInstance().blastmining(player)) if(id == 46 && mcPermissions.getInstance().blastmining(player))
{ {
PlayerProfile PP = Users.getProfile(player); int skill = Users.getProfile(player).getSkillLevel(SkillType.MINING);
int skill = PP.getSkillLevel(SkillType.MINING);
plugin.misc.tntTracker.put(block, skill); plugin.misc.tntTracker.put(block, skill);
} }
//Check if the blocks placed should be monitored so they do not give out XP in the future //Check if the blocks placed should be monitored so they do not give out XP in the future
if(m.shouldBeWatched(block)) if(m.shouldBeWatched(block))
{ {
int id = block.getTypeId();
//Only needed for blocks that use their block data (wood, pumpkins, etc.) //Only needed for blocks that use their block data (wood, pumpkins, etc.)
if (id == 17 || id == 73 || id == 74 || id == 81 || id == 83 || id == 86 || id == 91 || id == 106 || id == 98) if (id == 17 || id == 73 || id == 74 || id == 81 || id == 83 || id == 86 || id == 91 || id == 106 || id == 98)
plugin.misc.blockWatchList.add(block); plugin.misc.blockWatchList.add(block);
else { else
{
//block.setData((byte) 5); //Change the byte //block.setData((byte) 5); //Change the byte
//The following is a method to get around a breakage in 1.1-R2 and onward //The following is a method to get around a breakage in 1.1-R2 and onward
//it should be removed as soon as functionality to change a block //it should be removed as soon as functionality to change a block
//in this event returns. //in this event returns.
if(id == 39 || id == 40 || id == 37 || id == 38 || id == 111 || id == 106) { // ids of blocks that can be mined very quickly and need to be worked on fast if(id == 39 || id == 40 || id == 37 || id == 38 || id == 111 || id == 106) // ids of blocks that can be mined very quickly and need to be worked on fast
plugin.fastChangeQueue.push(block); plugin.fastChangeQueue.push(block);
} else { else
plugin.changeQueue.push(block); plugin.changeQueue.push(block);
}
} }
} }
if(block.getTypeId() == LoadProperties.anvilID && LoadProperties.anvilmessages) if(id == LoadProperties.anvilID && LoadProperties.anvilmessages)
{ {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
if(LoadProperties.spoutEnabled) if(!PP.getPlacedAnvil())
{ {
SpoutPlayer sPlayer = SpoutManager.getPlayer(player); if(LoadProperties.spoutEnabled)
if(sPlayer.isSpoutCraftEnabled()) {
{ SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
if(!PP.getPlacedAnvil()) if(sPlayer.isSpoutCraftEnabled())
{ sPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.IRON_BLOCK);
sPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.IRON_BLOCK);
PP.togglePlacedAnvil();
}
} }
else else
{ event.getPlayer().sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil")); //$NON-NLS-1$
if(!PP.getPlacedAnvil())
{ PP.togglePlacedAnvil();
event.getPlayer().sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil")); //$NON-NLS-1$
PP.togglePlacedAnvil();
}
}
}
else
{
if(!PP.getPlacedAnvil())
{
event.getPlayer().sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil")); //$NON-NLS-1$
PP.togglePlacedAnvil();
}
} }
} }
} }
@ -144,92 +123,69 @@ public class mcBlockListener implements Listener
Player player = event.getPlayer(); Player player = event.getPlayer();
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
Block block = event.getBlock(); Block block = event.getBlock();
int id = block.getTypeId();
ItemStack inhand = player.getItemInHand(); ItemStack inhand = player.getItemInHand();
if (event instanceof FakeBlockBreakEvent) if (event instanceof FakeBlockBreakEvent)
return; return;
/* /*
* HERBALISM * HERBALISM
*/ */
//TNT removal checks - needed for Blast Mining
if(block.getTypeId() == 46 && inhand.getTypeId() != 259 && mcPermissions.getInstance().blastmining(player))
{
plugin.misc.tntTracker.remove(block);
}
//Green Terra //Green Terra
if(PP.getHoePreparationMode() && mcPermissions.getInstance().herbalismAbility(player) && block.getTypeId() == 59 && block.getData() == (byte) 0x07) if(PP.getHoePreparationMode() && mcPermissions.getInstance().herbalismAbility(player) && ((id == 59 && block.getData() == (byte) 0x07) || Herbalism.canBeGreenTerra(block)))
{
Herbalism.greenTerraCheck(player); Herbalism.greenTerraCheck(player);
}
//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);
}
if(mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5)
Herbalism.herbalismProcCheck(block, player, event, plugin);
/* /*
* MINING * MINING
*/ */
//TNT removal checks - needed for Blast Mining
if(id == 46 && inhand.getTypeId() != 259 && mcPermissions.getInstance().blastmining(player))
plugin.misc.tntTracker.remove(block);
if(mcPermissions.getInstance().mining(player)) if(mcPermissions.getInstance().mining(player))
{ {
if(LoadProperties.miningrequirespickaxe) if(LoadProperties.miningrequirespickaxe && m.isMiningPick(inhand))
{ Mining.miningBlockCheck(player, block, plugin);
if(m.isMiningPick(inhand)) else if(!LoadProperties.miningrequirespickaxe)
{
Mining.miningBlockCheck(player, block, plugin);
}
} else
{
Mining.miningBlockCheck(player, block, plugin); Mining.miningBlockCheck(player, block, plugin);
}
} }
/* /*
* WOOD CUTTING * WOOD CUTTING
*/ */
if(mcPermissions.getInstance().woodcutting(player) && block.getTypeId() == 17) if(mcPermissions.getInstance().woodcutting(player) && id == 17)
{ {
if(LoadProperties.woodcuttingrequiresaxe) if(LoadProperties.woodcuttingrequiresaxe && m.isAxes(inhand))
{ WoodCutting.woodcuttingBlockCheck(player, block, plugin);
if(m.isAxes(inhand)) else if(!LoadProperties.woodcuttingrequiresaxe)
{
WoodCutting.woodcuttingBlockCheck(player, block, plugin);
}
} else
{
WoodCutting.woodcuttingBlockCheck(player, block, plugin); WoodCutting.woodcuttingBlockCheck(player, block, plugin);
}
if(PP.getTreeFellerMode()) if(PP.getTreeFellerMode())
{
WoodCutting.treeFeller(event, plugin); WoodCutting.treeFeller(event, plugin);
}
} }
/* /*
* EXCAVATION * EXCAVATION
*/ */
if(Excavation.canBeGigaDrillBroken(block) && mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 5) if(Excavation.canBeGigaDrillBroken(block) && mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 5)
Excavation.excavationProcCheck(block.getType(), block.getLocation(), player);
/*
* HERBALISM
*/
if(PP.getHoePreparationMode() && mcPermissions.getInstance().herbalism(player) && Herbalism.canBeGreenTerra(block))
{ {
Herbalism.greenTerraCheck(player); if(LoadProperties.excavationRequiresShovel && m.isShovel(inhand))
Excavation.excavationProcCheck(block, player);
else if(!LoadProperties.excavationRequiresShovel)
Excavation.excavationProcCheck(block, player);
} }
if(mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5)
Herbalism.herbalismProcCheck(block, player, event, plugin);
//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))
{ {
@ -248,6 +204,7 @@ public class mcBlockListener implements Listener
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
ItemStack inhand = player.getItemInHand(); ItemStack inhand = player.getItemInHand();
Block block = event.getBlock(); Block block = event.getBlock();
int id = block.getTypeId();
/* /*
* ABILITY PREPARATION CHECKS * ABILITY PREPARATION CHECKS
@ -256,44 +213,39 @@ public class mcBlockListener implements Listener
{ {
if(PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block)) if(PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block))
Herbalism.greenTerraCheck(player); Herbalism.greenTerraCheck(player);
if(PP.getAxePreparationMode() && block.getTypeId() == 17 && mcPermissions.getInstance().woodCuttingAbility(player)) if(PP.getAxePreparationMode() && id == 17 && mcPermissions.getInstance().woodCuttingAbility(player))
WoodCutting.treeFellerCheck(player); WoodCutting.treeFellerCheck(player);
if(PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block)) if(PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block))
Mining.superBreakerCheck(player); Mining.superBreakerCheck(player);
if(PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block)) if(PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block))
Excavation.gigaDrillBreakerActivationCheck(player); Excavation.gigaDrillBreakerActivationCheck(player);
} }
if(PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78)) if(PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || id == 78))
Unarmed.berserkActivationCheck(player); Unarmed.berserkActivationCheck(player);
/* /*
* TREE FELLER STUFF * TREE FELLER STUFF
*/ */
if(LoadProperties.spoutEnabled && block.getTypeId() == 17 && Users.getProfile(player).getTreeFellerMode()) if(LoadProperties.spoutEnabled && id == 17 && PP.getTreeFellerMode())
SpoutStuff.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation()); SpoutStuff.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
/* /*
* GREEN TERRA STUFF * GREEN TERRA STUFF
*/ */
if(PP.getGreenTerraMode() && mcPermissions.getInstance().herbalismAbility(player) && PP.getGreenTerraMode()) if(PP.getGreenTerraMode() && mcPermissions.getInstance().herbalismAbility(player))
Herbalism.greenTerra(player, block); Herbalism.greenTerra(player, block);
/* /*
* GIGA DRILL BREAKER CHECKS * GIGA DRILL BREAKER CHECKS
*/ */
if(PP.getGigaDrillBreakerMode() if(PP.getGigaDrillBreakerMode() && Excavation.canBeGigaDrillBroken(block) && m.blockBreakSimulate(block, player) && mcPermissions.getInstance().excavationAbility(player))
&& Excavation.canBeGigaDrillBroken(block)
&& m.blockBreakSimulate(block, player)
&& mcPermissions.getInstance().excavationAbility(player))
{ {
if(LoadProperties.excavationRequiresShovel) if(LoadProperties.excavationRequiresShovel && m.isShovel(inhand))
{ {
if(m.isShovel(inhand)){
event.setInstaBreak(true); event.setInstaBreak(true);
Excavation.gigaDrillBreaker(player, block); Excavation.gigaDrillBreaker(player, block);
} }
} else { else if(!LoadProperties.excavationRequiresShovel){
if(LoadProperties.toolsLoseDurabilityFromAbilities) if(LoadProperties.toolsLoseDurabilityFromAbilities)
{ {
@ -315,7 +267,7 @@ public class mcBlockListener implements Listener
if(PP.getBerserkMode() if(PP.getBerserkMode()
&& m.blockBreakSimulate(block, player) && m.blockBreakSimulate(block, player)
&& player.getItemInHand().getTypeId() == 0 && player.getItemInHand().getTypeId() == 0
&& (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78) && (Excavation.canBeGigaDrillBroken(block) || id == 78)
&& mcPermissions.getInstance().unarmedAbility(player)) && mcPermissions.getInstance().unarmedAbility(player))
{ {
event.setInstaBreak(true); event.setInstaBreak(true);
@ -360,7 +312,7 @@ public class mcBlockListener implements Listener
/* /*
* LEAF BLOWER CHECKS * LEAF BLOWER CHECKS
*/ */
if(block.getTypeId() == 18 if(id == 18
&& mcPermissions.getInstance().woodcutting(player) && mcPermissions.getInstance().woodcutting(player)
&& PP.getSkillLevel(SkillType.WOODCUTTING) >= 100 && PP.getSkillLevel(SkillType.WOODCUTTING) >= 100
&& m.blockBreakSimulate(block, player)) && m.blockBreakSimulate(block, player))
@ -380,11 +332,6 @@ public class mcBlockListener implements Listener
} }
} }
if(block.getType() == Material.AIR && plugin.misc.blockWatchList.contains(block))
{
plugin.misc.blockWatchList.remove(block);
}
} }
@EventHandler @EventHandler

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

@ -76,10 +76,10 @@ public class Excavation
Material t = block.getType(); Material t = block.getType();
return t == Material.DIRT || t == Material.GRASS || t == Material.SAND || t == Material.GRAVEL || t == Material.CLAY || t == Material.MYCEL || t == Material.SOUL_SAND; return t == Material.DIRT || t == Material.GRASS || t == Material.SAND || t == Material.GRAVEL || t == Material.CLAY || t == Material.MYCEL || t == Material.SOUL_SAND;
} }
public static void excavationProcCheck(Material type, Location loc, Player player) public static void excavationProcCheck(Block block, Player player)
{ {
if(LoadProperties.excavationRequiresShovel && !m.isShovel(player.getItemInHand())) Material type = block.getType();
return; Location loc = block.getLocation();
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
int skillLevel = PP.getSkillLevel(SkillType.EXCAVATION); int skillLevel = PP.getSkillLevel(SkillType.EXCAVATION);
@ -209,9 +209,9 @@ public class Excavation
{ {
PlayerAnimationEvent armswing = new PlayerAnimationEvent(player); PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
Bukkit.getPluginManager().callEvent(armswing); Bukkit.getPluginManager().callEvent(armswing);
Excavation.excavationProcCheck(block.getType(), block.getLocation(), player); Excavation.excavationProcCheck(block, player);
Excavation.excavationProcCheck(block.getType(), block.getLocation(), player); Excavation.excavationProcCheck(block, player);
Excavation.excavationProcCheck(block.getType(), block.getLocation(), player); Excavation.excavationProcCheck(block, player);
} }
if(LoadProperties.spoutEnabled) if(LoadProperties.spoutEnabled)

5
src/main/java/com/gmail/nossr50/skills/WoodCutting.java
View File

@ -126,10 +126,12 @@ public class WoodCutting
} }
//Remove the block //Remove the block
x.setData((byte) 0);
x.setType(Material.AIR); x.setType(Material.AIR);
plugin.misc.blockWatchList.remove(x);
//Drop the block //Drop the block
x.getWorld().dropItemNaturally(x.getLocation(), item); m.mcDropItem(x.getLocation(), item);
//Damage the tool more if the Tree is larger //Damage the tool more if the Tree is larger
durabilityLoss++; durabilityLoss++;
@ -146,6 +148,7 @@ public class WoodCutting
//Remove the block //Remove the block
x.setData((byte) 0); x.setData((byte) 0);
x.setType(Material.AIR); x.setType(Material.AIR);
plugin.misc.blockWatchList.remove(x);
//Damage the tool more if the Tree is larger //Damage the tool more if the Tree is larger
durabilityLoss++; durabilityLoss++;