Allow console to execute commands now that editsessions etc. accept actors

- Fixes #724
 - Fixes #1044
This commit is contained in:
dordsor21
2021-09-28 15:59:52 +01:00
parent fa2f50dea8
commit 0ed98729f8
10 changed files with 104 additions and 122 deletions

View File

@ -6,27 +6,28 @@ import com.fastasyncworldedit.core.util.MemUtil;
import com.fastasyncworldedit.core.util.Permission;
import com.fastasyncworldedit.core.util.WEManager;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.Extent;
public class MemoryCheckingExtent extends PassthroughExtent {
private final Player player;
private final Actor actor;
public MemoryCheckingExtent(Player player, Extent extent) {
public MemoryCheckingExtent(Actor actor, Extent extent) {
super(extent);
this.player = player;
this.actor = actor;
}
@Override
public Extent getExtent() {
if (MemUtil.isMemoryLimited()) {
if (this.player != null) {
player.print(Caption.of(
if (this.actor != null) {
actor.print(Caption.of(
"fawe.cancel.worldedit.cancel.reason",
Caption.of("fawe.cancel.worldedit.cancel.reason.low.memory")
));
if (Permission.hasPermission(this.player, "worldedit.fast")) {
this.player.print(Caption.of("fawe.info.worldedit.oom.admin"));
if (Permission.hasPermission(this.actor, "worldedit.fast")) {
this.actor.print(Caption.of("fawe.info.worldedit.oom.admin"));
}
}
WEManager.IMP.cancelEdit(this, FaweCache.LOW_MEMORY);