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

[BREAKING] Remove ignorepassable config support.

Browse Source
This commit is contained in:
asofold 2016-06-11 16:37:34 +02:00
parent 2ff0076e69
commit ed10330657
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -37,7 +37,6 @@ public abstract class ConfPaths {
public static final String SUB_GROUND = "ground";
public static final String SUB_HORIZONTAL = "horizontal";
public static final String SUB_HORIZONTALSPEED = "horizontalspeed"; // Phase out.
public static final String SUB_IGNOREPASSABLE = "ignorepassable";
public static final String SUB_LAG = "lag";
public static final String SUB_MAXHEIGHT = "maxheight";
public static final String SUB_MODEL = "model";
@ -816,6 +815,8 @@ public abstract class ConfPaths {
public static final String MOVING_TRACE_SIZE = "checks.moving.trace.size";
@Deprecated
public static final String MOVING_TRACE_MERGEDIST = "checks.moving.trace.mergedist";
@Deprecated
public static final String COMPATIBILITY_BLOCKS_IGNOREPASSABLE = "compatibility.blocks.ignorepassable";
/**
* Get moved paths for which an annotation doesn't work.

6
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
View File

@ -587,12 +587,6 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.COMPATIBILITY_EXEMPTIONS_REMOVE_LEAVE, true);
set(ConfPaths.COMPATIBILITY_SERVER_CBDEDICATED_ENABLE, true);
set(ConfPaths.COMPATIBILITY_SERVER_CBREFLECT_ENABLE, true);
set(ConfPaths.COMPATIBILITY_BLOCKS + ConfPaths.SUB_IGNOREPASSABLE, Arrays.asList(
Material.WOODEN_DOOR.name(), Material.IRON_DOOR_BLOCK.name(),
Material.TRAP_DOOR.name(),
Material.PISTON_EXTENSION.name(),
Material.PISTON_MOVING_PIECE.name() // TODO: ?
));
set(ConfPaths.COMPATIBILITY_BLOCKS + ConfPaths.SUB_ALLOWINSTANTBREAK, new LinkedList<String>());
set(ConfPaths.COMPATIBILITY_BLOCKS + ConfPaths.SUB_OVERRIDEFLAGS + ".snow", "default");
set(ConfPaths.COMPATIBILITY_BLOCKS_CHANGETRACKER_ACTIVE, false); // TODO: Activate once it really works?

10
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockProperties.java
View File

@ -2188,16 +2188,6 @@ public class BlockProperties {
* @param config
*/
public static void applyConfig(final RawConfigFile config, final String pathPrefix) {
// Ignore passable.
for (final String input : config.getStringList(pathPrefix + ConfPaths.SUB_IGNOREPASSABLE)) {
final Integer id = RawConfigFile.parseTypeId(input);
if (id == null || id < 0 || id >= 4096) {
StaticLog.logWarning("Bad block id (" + pathPrefix + ConfPaths.SUB_IGNOREPASSABLE + "): " + input);
}
else {
blockFlags[id] |= F_IGN_PASSABLE;
}
}
// Allow instant breaking.
for (final String input : config.getStringList(pathPrefix + ConfPaths.SUB_ALLOWINSTANTBREAK)) {