Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-12-28 11:28:11 +01:00
Code Issues Projects Releases Wiki Activity

Ignore "outside" clicks, i.e. slots outside of the inventory slot range.

Browse Source
This commit is contained in:
asofold 2013-03-14 11:02:41 +01:00
parent 9de6175874
commit 325d47fcbc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/InventoryListener.java
View File

@ -3,6 +3,7 @@ package fr.neatmonster.nocheatplus.checks.inventory;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -16,6 +17,7 @@ import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerItemHeldEvent; import org.bukkit.event.player.PlayerItemHeldEvent;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.PlayerInventory;
@ -154,7 +156,15 @@ public class InventoryListener extends CheckListener {
*/ */
if (event.getWhoClicked() instanceof Player) { if (event.getWhoClicked() instanceof Player) {
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
final Player player = (Player) event.getWhoClicked(); final HumanEntity entity = event.getWhoClicked();
if (!(entity instanceof Player)){
return;
}
final Player player = (Player) entity;
if (event.getSlot() == InventoryView.OUTSIDE){
InventoryData.getData(player).lastClickTime = now;
return;
}
// Illegal enchantment checks. // Illegal enchantment checks.
try{ try{
@ -170,7 +180,6 @@ public class InventoryListener extends CheckListener {
// Fast inventory manipulation check. // Fast inventory manipulation check.
if (fastClick.isEnabled(player)){ if (fastClick.isEnabled(player)){
final InventoryConfig cc = InventoryConfig.getConfig(player); final InventoryConfig cc = InventoryConfig.getConfig(player);
if (player.getGameMode() != GameMode.CREATIVE || !cc.fastClickSpareCreative){ if (player.getGameMode() != GameMode.CREATIVE || !cc.fastClickSpareCreative){
if (fastClick.check(player, now, data, cc)){ if (fastClick.check(player, now, data, cc)){