Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix console command usage.

Browse Source
This commit is contained in:
wizjany 2019-09-19 20:53:47 -04:00
parent 23ca70e49a
commit 44dc926c49
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java
View File

@ -28,6 +28,7 @@ import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import org.enginehub.piston.CommandParameters; import org.enginehub.piston.CommandParameters;
import org.enginehub.piston.exception.CommandException;
import org.enginehub.piston.gen.CommandCallListener; import org.enginehub.piston.gen.CommandCallListener;
import org.enginehub.piston.inject.Key; import org.enginehub.piston.inject.Key;
@ -73,15 +74,23 @@ public class CommandLoggingHandler implements CommandCallListener, AutoCloseable
logMode = loggingAnnotation.value(); logMode = loggingAnnotation.value();
} }
Optional<Actor> playerOpt = parameters.injectedValue(Key.of(Actor.class)); Optional<Actor> actorOpt = parameters.injectedValue(Key.of(Actor.class));
Optional<World> worldOpt = parameters.injectedValue(Key.of(World.class));
if (!playerOpt.isPresent() || !worldOpt.isPresent()) { if (!actorOpt.isPresent()) {
return; return;
} }
Actor actor = actorOpt.get();
Actor actor = playerOpt.get(); World world;
World world = worldOpt.get(); try {
Optional<World> worldOpt = parameters.injectedValue(Key.of(World.class));
if (!worldOpt.isPresent()) {
return;
}
world = worldOpt.get();
} catch (CommandException ex) {
return;
}
builder.append("WorldEdit: ").append(actor.getName()); builder.append("WorldEdit: ").append(actor.getName());
builder.append(" (in \"").append(world.getName()).append("\")"); builder.append(" (in \"").append(world.getName()).append("\")");