Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-14 07:58:08 +02:00
Code Issues Projects Releases Wiki Activity

Correct type of placed block, autosign uses Material.SIGN now.

Browse Source
This commit is contained in:
asofold 2014-02-16 22:51:55 +01:00
parent 598896a7cc
commit 3361280cc7
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockplace/AutoSign.java
View File

@ -41,9 +41,8 @@ public class AutoSign extends Check {
tags.clear();
final BlockPlaceData data = BlockPlaceData.getData(player);
Material mat = block.getType();
if (mat == Material.WALL_SIGN){
// Use one thing for signs.
mat = Material.SIGN_POST;
if (mat == Material.SIGN_POST || mat == Material.WALL_SIGN) {
mat = Material.SIGN;
}
if (data.autoSignPlacedHash != BlockPlaceListener.getBlockPlaceHash(block, mat)){
tags.add("block_mismatch");

1
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockplace/BlockPlaceData.java
View File

@ -85,6 +85,7 @@ public class BlockPlaceData extends ACheckData {
// AutoSign.
public long autoSignPlacedTime = 0;
/** Using Material.SIGN . */
public long autoSignPlacedHash = 0;
// Data of the fast place check.

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

@ -112,19 +112,22 @@ public class BlockPlaceListener extends CheckListener {
if (block == null || blockAgainst == null)
return;
final Material mat = block.getType();
// TODO: Revise material use (not block.get... ?)
//final Material mat = block.getType();
final Player player = event.getPlayer();
final Material placedMat = player.getItemInHand().getType(); // Safety first.
boolean cancelled = false;
final BlockPlaceData data = BlockPlaceData.getData(player);
final BlockPlaceConfig cc = BlockPlaceConfig.getConfig(player);
if (mat == Material.SIGN_POST || mat == Material.WALL_SIGN){
if (placedMat == Material.SIGN){
// Might move to MONITOR priority.
data.autoSignPlacedTime = System.currentTimeMillis();
// Always hash as sign post for improved compatibility with Lockette etc.
data.autoSignPlacedHash = getBlockPlaceHash(block, Material.SIGN_POST);
data.autoSignPlacedHash = getBlockPlaceHash(block, Material.SIGN);
}
// Fast place check.
if (fastPlace.isEnabled(player)){
if (fastPlace.check(player, block, data, cc)) {
@ -136,7 +139,7 @@ public class BlockPlaceListener extends CheckListener {
}
// No swing check (player doesn't swing their arm when placing a lily pad).
if (!cancelled && mat != Material.WATER_LILY && noSwing.isEnabled(player) && noSwing.check(player, data, cc)) {
if (!cancelled && placedMat != Material.WATER_LILY && noSwing.isEnabled(player) && noSwing.check(player, data, cc)) {
// Consider skipping all insta placables or using simplified version (true or true within time frame).
cancelled = true;
}
@ -152,7 +155,7 @@ public class BlockPlaceListener extends CheckListener {
}
// Surrounding material.
if (!cancelled && against.isEnabled(player) && against.check(player, block, mat, blockAgainst, data, cc)) {
if (!cancelled && against.isEnabled(player) && against.check(player, block, placedMat, blockAgainst, data, cc)) {
cancelled = true;
}
@ -239,6 +242,7 @@ public class BlockPlaceListener extends CheckListener {
final org.bukkit.block.Block relBlock = block.getRelative(event.getBlockFace());
final Material relMat = relBlock.getType();
// TODO: Placing inside of water, but not "against" ?
if (relMat == Material.WATER || relMat == Material.STATIONARY_WATER) return;
if (!player.hasPermission(Permissions.BLOCKPLACE_BOATSANYWHERE)){