feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Simplify we adapter

Browse Source
This commit is contained in:
Brokkonaut
2018-11-07 02:55:29 +01:00
parent f2dc3daad0
commit 737afcd1fa
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java
View File

@@ -4,7 +4,6 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.event.extent.EditSessionEvent; import com.sk89q.worldedit.event.extent.EditSessionEvent;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
@@ -18,7 +17,6 @@ import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.Config;
import de.diddiz.util.BukkitUtils; import de.diddiz.util.BukkitUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
@@ -45,20 +43,6 @@ public class WorldEditLoggingHook {
return new de.diddiz.LogBlock.Actor(weActor.getName()); return new de.diddiz.LogBlock.Actor(weActor.getName());
} }
private World adapt(com.sk89q.worldedit.world.World weWorld) {
if (weWorld == null) {
throw new NullPointerException("[Logblock-Worldedit] The provided world was null.");
}
if (weWorld instanceof BukkitWorld) {
return ((BukkitWorld) weWorld).getWorld();
}
World world = Bukkit.getServer().getWorld(weWorld.getName());
if (world == null) {
throw new IllegalArgumentException("Can't find a Bukkit world for " + weWorld);
}
return world;
}
public void hook() { public void hook() {
WorldEdit.getInstance().getEventBus().register(new Object() { WorldEdit.getInstance().getEventBus().register(new Object() {
@Subscribe @Subscribe
@@ -71,9 +55,8 @@ public class WorldEditLoggingHook {
// Check to ensure the world should be logged // Check to ensure the world should be logged
final World world; final World world;
final com.sk89q.worldedit.world.World k = event.getWorld();
try { try {
world = adapt(k); world = BukkitAdapter.adapt(event.getWorld());
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
plugin.getLogger().warning("Failed to register logging for WorldEdit!"); plugin.getLogger().warning("Failed to register logging for WorldEdit!");
plugin.getLogger().log(Level.WARNING, ex.getMessage(), ex); plugin.getLogger().log(Level.WARNING, ex.getMessage(), ex);