Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Quick fix attempt for placed material issues with off-hand.

Browse Source
This commit is contained in:
asofold 2016-07-20 10:03:17 +02:00
parent 20779443a2
commit 7243ab7538
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockplace/BlockPlaceListener.java
View File

@ -103,7 +103,7 @@ public class BlockPlaceListener extends CheckListener {
private final int idEnderPearl = counters.registerKey("throwenderpearl");
private final Class<?> blockMultiPlaceEvent = ReflectionUtil.getClass("org.bukkit.event.block.BlockMultiPlaceEvent");
private final boolean hasReplacedState = ReflectionUtil.getMethodNoArgs(BlockPlaceEvent.class, "getReplacedState", BlockState.class) != null;
private final boolean hasGetReplacedState = ReflectionUtil.getMethodNoArgs(BlockPlaceEvent.class, "getReplacedState", BlockState.class) != null;
public BlockPlaceListener() {
super(CheckType.BLOCKPLACE);
@ -130,7 +130,17 @@ public class BlockPlaceListener extends CheckListener {
// TODO: Revise material use (not block.get... ?)
//final Material mat = block.getType();
final Player player = event.getPlayer();
final Material placedMat = hasReplacedState ? event.getBlockPlaced().getType() : Bridge1_9.getItemInMainHand(player).getType(); // Safety first.
final Material placedMat;
if (hasGetReplacedState) {
placedMat = event.getBlockPlaced().getType();
}
else if (Bridge1_9.hasGetItemInOffHand()) {
final ItemStack stack = event.getItemInHand();
placedMat = BlockProperties.isAir(stack) ? Material.AIR : stack.getType();
}
else {
placedMat = Bridge1_9.getItemInMainHand(player).getType(); // Safety first.
}
boolean cancelled = false;
final BlockPlaceData data = BlockPlaceData.getData(player);