Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding

Browse Source 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
#	worldedit-libs/core/build.gradle.kts
This commit is contained in:
MattBDev
2019-09-02 15:24:53 -04:00
parent c20f4c6b7f e8a768f7c8
commit 06a92d29b1
28 changed files with 27026 additions and 1199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -937,9 +937,9 @@ public final class BlockTypes {
}
// Add to $Registry
for (BlockType type : values) {
BlockType.REGISTRY.register(type.getId().toLowerCase(Locale.ROOT), type);
}
// for (BlockType type : values) {
// BlockType.REGISTRY.register(type.getId().toLowerCase(Locale.ROOT), type);
// }
states = stateList.toArray(new BlockState[stateList.size()]);
@ -969,7 +969,6 @@ public final class BlockTypes {
}
// register states
if (typeName.startsWith("minecraft:")) BlockType.REGISTRY.register(typeName.substring(10), existing);
BlockType.REGISTRY.register(typeName, existing);
String nameSpace = typeName.substring(0, typeName.indexOf(':'));
$NAMESPACES.add(nameSpace);