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

get tool from player

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Jesse Boyd 2019-06-29 04:27:46 +10:00
Ursprung d6280ec945
Commit 8b9a2ff18c
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 59F1DE6293AF6E1F
3 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
Datei anzeigen

@ -128,7 +128,7 @@ public class FaweBukkit implements IFawe, Listener {
} }
try { try {
Class.forName("com.destroystokyo.paper.event.server.AsyncTabCompleteEvent"); Class.forName("com.destroystokyo.paper.event.server.AsyncTabCompleteEvent");
Bukkit.getPluginManager().registerEvents(new AsyncTabCompleteListener(WorldEditPlugin.getInstance()), plugin); Bukkit.getPluginManager().registerEvents(new AsyncTabCompleteListener(WorldEditPlugin.getInstance()), plugin);
} catch (Throwable ignore) { } catch (Throwable ignore) {
debug("====== USE PAPER ======"); debug("====== USE PAPER ======");

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

@ -83,10 +83,10 @@ public class ToolUtilCommands {
@CommandPermissions("worldedit.brush.options.mask") @CommandPermissions("worldedit.brush.options.mask")
public void mask(Player player, LocalSession session, @Optional Mask mask) throws WorldEditException { public void mask(Player player, LocalSession session, @Optional Mask mask) throws WorldEditException {
if (mask == null) { if (mask == null) {
session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setMask(null); session.getBrushTool(player).setMask(null);
player.print("Brush mask disabled."); player.print("Brush mask disabled.");
} else { } else {
session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setMask(mask); session.getBrushTool(player).setMask(mask);
player.print("Brush mask set."); player.print("Brush mask set.");
} }
} }
@ -100,7 +100,7 @@ public class ToolUtilCommands {
) )
@CommandPermissions("worldedit.brush.options.material") @CommandPermissions("worldedit.brush.options.material")
public void material(Player player, LocalSession session, Pattern pattern) throws WorldEditException { public void material(Player player, LocalSession session, Pattern pattern) throws WorldEditException {
session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setFill(pattern); session.getBrushTool(player).setFill(pattern);
player.print("Brush material set."); player.print("Brush material set.");
} }
@ -114,7 +114,7 @@ public class ToolUtilCommands {
@CommandPermissions("worldedit.brush.options.range") @CommandPermissions("worldedit.brush.options.range")
public void range(Player player, LocalSession session, CommandContext args) throws WorldEditException { public void range(Player player, LocalSession session, CommandContext args) throws WorldEditException {
int range = args.getInteger(0); int range = args.getInteger(0);
session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setRange(range); session.getBrushTool(player).setRange(range);
player.print("Brush range set."); player.print("Brush range set.");
} }
@ -130,7 +130,7 @@ public class ToolUtilCommands {
int radius = args.getInteger(0); int radius = args.getInteger(0);
we.checkMaxBrushRadius(radius); we.checkMaxBrushRadius(radius);
session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setSize(radius); session.getBrushTool(player).setSize(radius);
player.print("Brush size set."); player.print("Brush size set.");
} }
} }

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ShapedBrushCommand.java
Datei anzeigen

@ -72,7 +72,7 @@ public class ShapedBrushCommand extends SimpleCommand<Object> {
try { try {
WorldEdit.getInstance().checkMaxBrushRadius(radius); WorldEdit.getInstance().checkMaxBrushRadius(radius);
BrushTool tool = session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()); BrushTool tool = session.getBrushTool(player);
tool.setSize(radius); tool.setSize(radius);
tool.setFill(null); tool.setFill(null);
tool.setBrush(new OperationFactoryBrush(factory, regionFactory, session), permission); tool.setBrush(new OperationFactoryBrush(factory, regionFactory, session), permission);