Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-19 17:30:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

getContext > getPrimary

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zeranny 2024-01-31 20:19:36 +00:00
Ursprung 5817285b16
Commit 6ee126a8af
1 geänderte Dateien mit 7 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

15
worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
Datei anzeigen

@ -85,9 +85,8 @@ public class ToolUtilCommands {
player.print(Caption.of("worldedit.tool.mask.disabled")); player.print(Caption.of("worldedit.tool.mask.disabled"));
tool.setMask(null); tool.setMask(null);
} else { } else {
BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary();
String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())) String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring();
.getSubstring();
settings.addSetting(BrushSettings.SettingType.MASK, lastArg); settings.addSetting(BrushSettings.SettingType.MASK, lastArg);
settings.setMask(maskOpt); settings.setMask(maskOpt);
tool.update(); tool.update();
@ -118,7 +117,7 @@ public class ToolUtilCommands {
if (pattern == null) { if (pattern == null) {
tool.setFill(null); tool.setFill(null);
} else { } else {
BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary();
settings.setFill(pattern); settings.setFill(pattern);
String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring();
settings.addSetting(BrushSettings.SettingType.FILL, lastArg); settings.addSetting(BrushSettings.SettingType.FILL, lastArg);
@ -158,7 +157,7 @@ public class ToolUtilCommands {
we.checkMaxBrushRadius(size); we.checkMaxBrushRadius(size);
BrushTool tool = session.getBrushTool(player, false); BrushTool tool = session.getBrushTool(player, false);
BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary();
settings.setSize(size); settings.setSize(size);
String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring();
settings.addSetting(BrushSettings.SettingType.FILL, lastArg); settings.addSetting(BrushSettings.SettingType.FILL, lastArg);
@ -326,7 +325,7 @@ public class ToolUtilCommands {
return; return;
} }
BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary();
Scroll action = Scroll.fromArguments(tool, player, session, mode, commandStr, true); Scroll action = Scroll.fromArguments(tool, player, session, mode, commandStr, true);
settings.setScrollAction(action); settings.setScrollAction(action);
if (mode == Scroll.Action.NONE) { if (mode == Scroll.Action.NONE) {
@ -364,7 +363,7 @@ public class ToolUtilCommands {
tool.setSourceMask(null); tool.setSourceMask(null);
return; return;
} }
BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary();
String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring();
settings.addSetting(BrushSettings.SettingType.SOURCE_MASK, lastArg); settings.addSetting(BrushSettings.SettingType.SOURCE_MASK, lastArg);
settings.setSourceMask(maskArg); settings.setSourceMask(maskArg);
@ -395,7 +394,7 @@ public class ToolUtilCommands {
tool.setTransform(null); tool.setTransform(null);
return; return;
} }
BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary();
String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring();
settings.addSetting(BrushSettings.SettingType.TRANSFORM, lastArg); settings.addSetting(BrushSettings.SettingType.TRANSFORM, lastArg);
settings.setTransform(transform); settings.setTransform(transform);