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

Fix error when parsing hand/offhand/pos1 as blocks.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
wizjany 2019-03-03 19:51:49 -05:00
Ursprung aafb854e4f
Commit f84f3c6f85
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -238,7 +238,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
} }
blockType = blockInHand.getBlockType(); blockType = blockInHand.getBlockType();
blockStates = blockInHand.getStates(); blockStates.putAll(blockInHand.getStates());
} else if ("offhand".equalsIgnoreCase(typeString)) { } else if ("offhand".equalsIgnoreCase(typeString)) {
// Get the block type from the item in the user's off hand. // Get the block type from the item in the user's off hand.
final BaseBlock blockInHand = getBlockInHand(context.requireActor(), HandSide.OFF_HAND); final BaseBlock blockInHand = getBlockInHand(context.requireActor(), HandSide.OFF_HAND);
@ -247,7 +247,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
} }
blockType = blockInHand.getBlockType(); blockType = blockInHand.getBlockType();
blockStates = blockInHand.getStates(); blockStates.putAll(blockInHand.getStates());
} else if ("pos1".equalsIgnoreCase(typeString)) { } else if ("pos1".equalsIgnoreCase(typeString)) {
// Get the block type from the "primary position" // Get the block type from the "primary position"
final World world = context.requireWorld(); final World world = context.requireWorld();
@ -260,7 +260,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
final BlockState blockInHand = world.getBlock(primaryPosition); final BlockState blockInHand = world.getBlock(primaryPosition);
blockType = blockInHand.getBlockType(); blockType = blockInHand.getBlockType();
blockStates = blockInHand.getStates(); blockStates.putAll(blockInHand.getStates());
} else { } else {
// Attempt to lookup a block from ID or name. // Attempt to lookup a block from ID or name.
blockType = BlockTypes.get(typeString.toLowerCase()); blockType = BlockTypes.get(typeString.toLowerCase());