SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Jesse Boyd 2018-10-03 14:58:34 +10:00
Commit e07ecb73dd
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 59F1DE6293AF6E1F
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
Datei anzeigen

@ -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
Datei anzeigen

@ -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__) {