From 9abbcc908d24ccadc5749253d60ccca486b3c8b7 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sat, 14 Jun 2025 21:56:02 +0200 Subject: [PATCH] Remove unused fillRegion method from WorldEdit wrapper and related code --- .../fightsystem/utils/WorldeditWrapper14.java | 15 --------------- .../fightsystem/utils/WorldeditWrapper8.java | 12 ------------ .../steamwar/fightsystem/commands/WGCommand.java | 2 ++ .../fightsystem/fight/FightSchematic.java | 4 ---- .../fightsystem/utils/WorldeditWrapper.java | 3 --- 5 files changed, 2 insertions(+), 34 deletions(-) diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java index e26c8525..9a0ae4b5 100644 --- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java +++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java @@ -21,11 +21,9 @@ package de.steamwar.fightsystem.utils; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.worldedit.EditSession; -import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.bukkit.BukkitAdapter; -import com.sk89q.worldedit.bukkit.BukkitBlockRegistry; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard; import com.sk89q.worldedit.extent.clipboard.Clipboard; @@ -41,7 +39,6 @@ import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.session.ClipboardHolder; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BaseBlock; -import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.FightSystem; @@ -50,7 +47,6 @@ import de.steamwar.sql.SchematicData; import de.steamwar.sql.SchematicNode; import org.bukkit.DyeColor; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.util.Vector; import java.io.ByteArrayOutputStream; @@ -151,15 +147,4 @@ public class WorldeditWrapper14 implements WorldeditWrapper { new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), NodeData.SchematicFormat.SPONGE_V2); } - - @Override - public void fillRegion(org.bukkit.World world, Region region, Material material) { - EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(world), -1); - try { - e.setBlocks(new CuboidRegion(new BukkitWorld(world), BlockVector3.at(region.getMinX(), region.getMinY(), region.getMinZ()), BlockVector3.at(region.getMaxX(), region.getMaxY(), region.getMaxZ())), BlockTypes.get(material.name()).getDefaultState().toBaseBlock()); - } catch (MaxChangedBlocksException ex) { - throw new RuntimeException(ex); - } - e.flushSession(); - } } diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java index 58d51350..d0479e46 100644 --- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java +++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java @@ -22,7 +22,6 @@ package de.steamwar.fightsystem.utils; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.worldedit.*; import com.sk89q.worldedit.blocks.BaseBlock; -import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard; import com.sk89q.worldedit.extent.clipboard.Clipboard; @@ -143,15 +142,4 @@ public class WorldeditWrapper8 implements WorldeditWrapper { new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), NodeData.SchematicFormat.MCEDIT); } - - @Override - public void fillRegion(org.bukkit.World world, Region region, Material material) { - EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(world), -1); - try { - e.setBlocks(new CuboidRegion(new BukkitWorld(world), BlockVector.toBlockPoint(region.getMinX(), region.getMinY(), region.getMinZ()), BlockVector.toBlockPoint(region.getMaxX(), region.getMaxY(), region.getMaxZ())), new BaseBlock(BlockType.lookup(material.name()).getID())); - } catch (MaxChangedBlocksException ex) { - throw new RuntimeException(ex); - } - e.flushQueue(); - } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java index edb891fc..c1157018 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java @@ -21,6 +21,7 @@ package de.steamwar.fightsystem.commands; import de.steamwar.fightsystem.ArenaMode; import de.steamwar.fightsystem.fight.Fight; +import de.steamwar.fightsystem.fight.FightWorld; import de.steamwar.fightsystem.states.FightState; import de.steamwar.fightsystem.states.StateDependentCommand; import org.bukkit.command.Command; @@ -39,6 +40,7 @@ public class WGCommand implements CommandExecutor { if(!(sender instanceof Player)) { return false; } + FightWorld.resetWorld(); Fight.getBlueTeam().pasteSchem(); return false; } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java index 2c8fc716..d566c022 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java @@ -141,10 +141,6 @@ public class FightSchematic extends StateDependent { team.teleportToSpawn(); - if(Config.mode == ArenaMode.CHECK) { - WorldeditWrapper.impl.fillRegion(Config.world, region, Material.AIR); - } - Vector dims = WorldeditWrapper.impl.getDimensions(clipboard); WorldeditWrapper.impl.pasteClipboard( clipboard, diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java index f486c4d6..83c68803 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java @@ -27,8 +27,6 @@ import de.steamwar.fightsystem.FightSystem; import de.steamwar.sql.SchematicNode; import org.bukkit.DyeColor; import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; import org.bukkit.util.Vector; import java.io.IOException; @@ -42,5 +40,4 @@ public interface WorldeditWrapper { Vector getDimensions(Clipboard clipboard); Clipboard loadChar(String charName) throws IOException; void saveSchem(SchematicNode schem, Region region, int minY) throws WorldEditException; - void fillRegion(World world, Region region, Material material); }