Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/boy0001/WorldEdit

Browse Source
This commit is contained in:
Jesse Boyd 2018-10-03 14:58:34 +10:00
commit e07ecb73dd
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
View File

@ -259,7 +259,7 @@ public class DefaultBlockParser extends InputParser<BlockStateHolder> {
if (context.isRestricted()) { if (context.isRestricted()) {
Actor actor = context.requireActor(); Actor actor = context.requireActor();
if (actor != null) { if (actor != null) {
if (!actor.hasPermission("worldedit.anyblock") && worldEdit.getConfiguration().disallowedBlocks.contains(blockType.getId())) { if (!actor.hasPermission("worldedit.anyblock") && worldEdit.getConfiguration().disallowedBlocks.contains(blockType)) {
throw new DisallowedUsageException("You are not allowed to use '" + input + "'"); throw new DisallowedUsageException("You are not allowed to use '" + input + "'");
} }
if (nbt != null) { if (nbt != null) {

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -1015,7 +1015,7 @@ public enum BlockTypes implements BlockType {
for (BlockTypes type : oldValues) { for (BlockTypes type : oldValues) {
if (!blockMap.containsKey(type.getId())) { if (!blockMap.containsKey(type.getId())) {
type.init(type.getId(), 0, new ArrayList<>()); type.init(type.getId(), 0, new ArrayList<>());
Fawe.debug("Invalid block registered " + type.getId()); if (type != __RESERVED__) Fawe.debug("Invalid block registered " + type.getId());
size++; size++;
} }
if (type != __RESERVED__) { if (type != __RESERVED__) {