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

Trim flag inputs for more tolerance.

Browse Source
This commit is contained in:
asofold 2013-03-13 06:30:24 +01:00
parent 1ec7f997cf
commit 4cbefc0184
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NCPCompat/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockProperties.java
View File

@ -337,11 +337,16 @@ public class BlockProperties {
try{
initTools(mcAccess, worldConfigProvider);
initBlocks(mcAccess, worldConfigProvider);
// TODO: try-catch over this one.
// Allow mcAccess to setup block properties.
if (mcAccess instanceof BlockPropertiesSetup){
try{
((BlockPropertiesSetup) mcAccess).setupBlockProperties(worldConfigProvider);
}
// TODO: Add registry for further BlockPropertiesSetup instances.
catch(Throwable t){
LogUtil.logSevere("[NoCheatPlus] McAccess.setupBlockProperties could not execute properly: " + t.getClass().getSimpleName());
LogUtil.logSevere(t);
}
}
}
catch(Throwable t){
LogUtil.logSevere(t);
@ -735,7 +740,7 @@ public class BlockProperties {
* @throws InputMismatchException if failed to parse.
*/
public static long parseFlag(final String input){
final String ucInput = input.toUpperCase();
final String ucInput = input.trim().toUpperCase();
final Long flag = nameFlagMap.get(ucInput);
if (flag != null) return flag.longValue();
try{
@ -1444,10 +1449,11 @@ public class BlockProperties {
hasErrors = true;
continue;
}
final Collection<String> split = StringUtil.split((String) obj, ' ', ',', '/', '|', ';', '\t');
final Collection<String> split = StringUtil.split((String) obj, ' ', ',', '/', '|', '+', ';', '\t');
long flags = 0;
boolean error = false;
for (final String input : split){
for (String input : split){
input = input.trim();
if (input.isEmpty()) continue;
try{
flags |= parseFlag(input);
@ -1757,6 +1763,7 @@ public class BlockProperties {
final int iMaxY = Math.min(Location.locToBlock(maxY), maxBlockY);
final int iMinZ = Location.locToBlock(minZ);
final int iMaxZ = Location.locToBlock(maxZ);
// System.out.println("*** isOnGround check size: " + ((iMaxX - iMinX + 1) * (iMaxY - iMinY + 1) * (iMaxZ - iMinZ + 1)));
for (int x = iMinX; x <= iMaxX; x++){
for (int z = iMinZ; z <= iMaxZ; z++){
@ -2013,6 +2020,7 @@ public class BlockProperties {
final int iMaxY = Location.locToBlock(maxY);
final int iMinZ = Location.locToBlock(minZ);
final int iMaxZ = Location.locToBlock(maxZ);
// System.out.println("*** collect flags check size: " + ((iMaxX - iMinX + 1) * (iMaxY - iMinY + 1) * (iMaxZ - iMinZ + 1)));
long flags = 0;
for (int x = iMinX; x <= iMaxX; x++){
for (int z = iMinZ; z <= iMaxZ; z++){