Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-21 15:01:29 +01:00
Code Issues Projects Releases Wiki Activity

Bleeding: Add SPLASH_POTION to blockplace.speed. Add yawrate +

Browse Source 
improbable
to
blockplace.speed and inventory.instantbow .
This commit is contained in:
asofold 2012-10-01 07:39:38 +02:00
parent 152b68f5b4
commit 0574530c45
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fr/neatmonster/nocheatplus/checks/blockplace/BlockPlaceListener.java
View File

@ -1,5 +1,6 @@
package fr.neatmonster.nocheatplus.checks.blockplace; package fr.neatmonster.nocheatplus.checks.blockplace;
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.Player; import org.bukkit.entity.Player;
@ -12,6 +13,7 @@ import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.player.PlayerAnimationEvent; import org.bukkit.event.player.PlayerAnimationEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import fr.neatmonster.nocheatplus.checks.combined.Combined;
import fr.neatmonster.nocheatplus.checks.combined.Improbable; import fr.neatmonster.nocheatplus.checks.combined.Improbable;
/* /*
@ -191,6 +193,8 @@ public class BlockPlaceListener implements Listener {
break; break;
case THROWN_EXP_BOTTLE: case THROWN_EXP_BOTTLE:
break; break;
case SPLASH_POTION:
break;
default: default:
return; return;
} }
@ -198,8 +202,18 @@ public class BlockPlaceListener implements Listener {
final Player player = (Player) event.getEntity().getShooter(); final Player player = (Player) event.getEntity().getShooter();
// Do the actual check... // Do the actual check...
if (speed.isEnabled(player) && speed.check(player)) if (speed.isEnabled(player)){
final long now = System.currentTimeMillis();
final Location loc = player.getLocation();
if (Combined.checkYawRate(player, loc.getYaw(), now, loc.getWorld().getName()))
event.setCancelled(true);
if (speed.check(player))
// If the check was positive, cancel the event. // If the check was positive, cancel the event.
event.setCancelled(true); event.setCancelled(true);
else if (Improbable.check(player, 1f, now))
// COmbined fighting speed.
event.setCancelled(true);
}
} }
} }

9
src/fr/neatmonster/nocheatplus/checks/inventory/InventoryListener.java
View File

@ -1,5 +1,6 @@
package fr.neatmonster.nocheatplus.checks.inventory; package fr.neatmonster.nocheatplus.checks.inventory;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -13,6 +14,7 @@ import org.bukkit.event.inventory.InventoryEvent;
import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import fr.neatmonster.nocheatplus.checks.combined.Combined;
import fr.neatmonster.nocheatplus.checks.combined.Improbable; import fr.neatmonster.nocheatplus.checks.combined.Improbable;
/* /*
@ -73,10 +75,15 @@ public class InventoryListener implements Listener {
if (event.getEntity() instanceof Player) { if (event.getEntity() instanceof Player) {
final Player player = (Player) event.getEntity(); final Player player = (Player) event.getEntity();
if (instantBow.isEnabled(player)){ if (instantBow.isEnabled(player)){
final long now = System.currentTimeMillis();
final Location loc = player.getLocation();
if (Combined.checkYawRate(player, loc.getYaw(), now, loc.getWorld().getName()))
event.setCancelled(true);
// Still check instantBow.
if (instantBow.check(player, event.getForce())) if (instantBow.check(player, event.getForce()))
// The check requested the event to be cancelled. // The check requested the event to be cancelled.
event.setCancelled(true); event.setCancelled(true);
if (Improbable.check(player, 1f, System.currentTimeMillis())) else if (Improbable.check(player, 1f, now))
// COmbined fighting speed. // COmbined fighting speed.
event.setCancelled(true); event.setCancelled(true);
} }