Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Merge pull request 'Remove Shields from Check Arena' (#67) from remove-shield-from-check-arena into main

Browse Source 
Reviewed-on: SteamWar/SteamWar#67
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
This commit is contained in:
YoyoNow
2025-06-26 14:20:15 +02:00
parent 75c4966e37 fcebb4ffd3
commit 0f68f671f5
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java
+1 -4
View File
@@ -20,10 +20,7 @@
package de.steamwar.fightsystem.utils; package de.steamwar.fightsystem.utils;
import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTInputStream;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.*;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard; import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
+3
View File
@@ -21,6 +21,7 @@ package de.steamwar.fightsystem.commands;
import de.steamwar.fightsystem.ArenaMode; import de.steamwar.fightsystem.ArenaMode;
import de.steamwar.fightsystem.fight.Fight; import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.fight.FightWorld;
import de.steamwar.fightsystem.states.FightState; import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentCommand; import de.steamwar.fightsystem.states.StateDependentCommand;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@@ -39,7 +40,9 @@ public class WGCommand implements CommandExecutor {
if(!(sender instanceof Player)) { if(!(sender instanceof Player)) {
return false; return false;
} }
FightWorld.resetWorld();
Fight.getBlueTeam().pasteSchem(); Fight.getBlueTeam().pasteSchem();
Fight.getRedTeam().pasteSchem();
return false; return false;
} }
} }
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
+1
View File
@@ -140,6 +140,7 @@ public class FightSchematic extends StateDependent {
FreezeWorld freezer = new FreezeWorld(); FreezeWorld freezer = new FreezeWorld();
team.teleportToSpawn(); team.teleportToSpawn();
Vector dims = WorldeditWrapper.impl.getDimensions(clipboard); Vector dims = WorldeditWrapper.impl.getDimensions(clipboard);
WorldeditWrapper.impl.pasteClipboard( WorldeditWrapper.impl.pasteClipboard(
clipboard, clipboard,