Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

This should make us fully NoCheat compatible.

Browse Source
This commit is contained in:
nossr50 2012-02-25 04:27:09 -08:00
parent 77b0dd725c
commit f481741bb5
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
@ -37,7 +36,6 @@ import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockDamageEvent; import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerAnimationEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.SpoutManager;
@ -86,7 +84,8 @@ public class mcBlockListener implements Listener
//Only needed for blocks that use their block data (wood, pumpkins, etc.) //Only needed for blocks that use their block data (wood, pumpkins, etc.)
boolean shouldBeChanged = true; boolean shouldBeChanged = true;
switch(mat){ switch(mat)
{
case CACTUS: case CACTUS:
case GLOWING_REDSTONE_ORE: case GLOWING_REDSTONE_ORE:
case JACK_O_LANTERN: case JACK_O_LANTERN:
@ -95,7 +94,7 @@ public class mcBlockListener implements Listener
case REDSTONE_ORE: case REDSTONE_ORE:
case SUGAR_CANE_BLOCK: case SUGAR_CANE_BLOCK:
case VINE: case VINE:
shouldBeChanged = false; shouldBeChanged = false; //We don't want these added to changeQueue
plugin.misc.blockWatchList.add(block); plugin.misc.blockWatchList.add(block);
break; break;
case BROWN_MUSHROOM: case BROWN_MUSHROOM:
@ -251,7 +250,7 @@ public class mcBlockListener implements Listener
/* /*
* GIGA DRILL BREAKER CHECKS * GIGA DRILL BREAKER CHECKS
*/ */
if(PP.getGigaDrillBreakerMode() && Excavation.canBeGigaDrillBroken(block) && m.blockBreakSimulate(block, player) && mcPermissions.getInstance().excavationAbility(player)) if(PP.getGigaDrillBreakerMode() && Excavation.canBeGigaDrillBroken(block) && m.blockBreakSimulate(block, player, true) && mcPermissions.getInstance().excavationAbility(player))
{ {
if(LoadProperties.excavationRequiresShovel && m.isShovel(inhand)) if(LoadProperties.excavationRequiresShovel && m.isShovel(inhand))
{ {
@ -278,14 +277,12 @@ public class mcBlockListener implements Listener
* BERSERK MODE CHECKS * BERSERK MODE CHECKS
*/ */
if(PP.getBerserkMode() if(PP.getBerserkMode()
&& m.blockBreakSimulate(block, player) && m.blockBreakSimulate(block, player, true)
&& player.getItemInHand().getTypeId() == 0 && player.getItemInHand().getTypeId() == 0
&& (Excavation.canBeGigaDrillBroken(block) || id == 78) && (Excavation.canBeGigaDrillBroken(block) || id == 78)
&& mcPermissions.getInstance().unarmedAbility(player)) && mcPermissions.getInstance().unarmedAbility(player))
{ {
event.setInstaBreak(true); event.setInstaBreak(true);
PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
Bukkit.getPluginManager().callEvent(armswing);
if(LoadProperties.spoutEnabled) if(LoadProperties.spoutEnabled)
SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation()); SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
@ -296,7 +293,7 @@ public class mcBlockListener implements Listener
*/ */
if(PP.getSuperBreakerMode() if(PP.getSuperBreakerMode()
&& Mining.canBeSuperBroken(block) && Mining.canBeSuperBroken(block)
&& m.blockBreakSimulate(block, player) && m.blockBreakSimulate(block, player, true)
&& mcPermissions.getInstance().miningAbility(player)) && mcPermissions.getInstance().miningAbility(player))
{ {
if(LoadProperties.miningrequirespickaxe) if(LoadProperties.miningrequirespickaxe)
@ -328,7 +325,7 @@ public class mcBlockListener implements Listener
if(id == 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, true))
{ {
if(LoadProperties.woodcuttingrequiresaxe) if(LoadProperties.woodcuttingrequiresaxe)
{ {

2
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -260,7 +260,7 @@ public class mcPlayerListener implements Listener
if(block.getType() == Material.DIRT || block.getType() == Material.COBBLESTONE || block.getType() == Material.SMOOTH_BRICK) if(block.getType() == Material.DIRT || block.getType() == Material.COBBLESTONE || block.getType() == Material.SMOOTH_BRICK)
{ {
if(Math.random() * 1500 <= PP.getSkillLevel(SkillType.HERBALISM) && m.blockBreakSimulate(block, player)) if(Math.random() * 1500 <= PP.getSkillLevel(SkillType.HERBALISM) && m.blockBreakSimulate(block, player, false))
{ {
switch(block.getType()) switch(block.getType())
{ {

10
src/main/java/com/gmail/nossr50/m.java
View File

@ -26,6 +26,7 @@ import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.*; import org.bukkit.entity.*;
import org.bukkit.event.player.PlayerAnimationEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.*; import com.gmail.nossr50.config.*;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
@ -149,8 +150,15 @@ public class m
return x; return x;
} }
public static boolean blockBreakSimulate(Block block, Player player) public static boolean blockBreakSimulate(Block block, Player player, Boolean shouldArmSwing)
{ {
//Support for NoCheat
if(shouldArmSwing)
{
PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
Bukkit.getPluginManager().callEvent(armswing);
}
FakeBlockBreakEvent event = new FakeBlockBreakEvent(block, player); FakeBlockBreakEvent event = new FakeBlockBreakEvent(block, player);
if(block != null && player != null){ if(block != null && player != null){
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);

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

@ -75,11 +75,7 @@ public class WoodCutting
for(Block x : toBeFelled) for(Block x : toBeFelled)
{ {
//Stupid NoCheat compatibility stuff if(m.blockBreakSimulate(x, player, true))
PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
Bukkit.getPluginManager().callEvent(armswing);
if(m.blockBreakSimulate(x, player))
{ {
if(x.getType() == Material.LOG) if(x.getType() == Material.LOG)
{ {