Merge pull request 'Allow administration replays without restrictions' (#329) from private_replays into master

Reviewed-on: #329
Reviewed-by: YoyoNow <jwsteam@nidido.de>

FightSystem_8/src/de/steamwar/fightsystem/utils/FlatteningWrapper8.java

@@ -72,7 +72,7 @@ public class FlatteningWrapper8 implements FlatteningWrapper.IFlatteningWrapper
 
     @Override
     public void forceLoadChunk(World world, int cX, int cZ) {
-        // not possible in 1.8
+        world.setKeepSpawnInMemory(true);
     }
 
     @Override

FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java

@@ -40,7 +40,7 @@ public enum ArenaMode {
     public static final Set<ArenaMode> Test = Collections.unmodifiableSet(EnumSet.of(TEST, CHECK));
     public static final Set<ArenaMode> Ranked = Collections.unmodifiableSet(EnumSet.of(RANKED));
     public static final Set<ArenaMode> Prepare = Collections.unmodifiableSet(EnumSet.of(PREPARE));
-    public static final Set<ArenaMode> Replay = Collections.unmodifiableSet(EnumSet.of(REPLAY));
+    public static final Set<ArenaMode> Replay = Collections.unmodifiableSet(EnumSet.of(REPLAY, TEST));
 
     public static final Set<ArenaMode> AntiReplay = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(REPLAY)));
     public static final Set<ArenaMode> AntiTest = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(TEST, CHECK)));

FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java

@@ -141,6 +141,7 @@ public class FightSystem extends JavaPlugin {
         new FileRecorder();
 
         REntity.initWatchers();
+        FileSource.startReplay();
 
         if(Config.mode == ArenaMode.EVENT) {
             setPreSchemState();
@@ -148,9 +149,6 @@ public class FightSystem extends JavaPlugin {
             Fight.getBlueTeam().setSchem(SchematicNode.getSchematicNode(Config.CheckSchemID));
         }else if(Config.mode == ArenaMode.PREPARE) {
             Fight.getUnrotated().setSchem(SchematicNode.getSchematicNode(Config.PrepareSchemID));
-        }else if(Config.mode == ArenaMode.REPLAY) {
-            FightWorld.forceLoad();
-            FileSource.startReplay();
         }
     }
 

FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java

@@ -61,7 +61,6 @@ public class FightWorld extends StateDependent {
             world.loadChunk(cX, cZ);
             FlatteningWrapper.impl.forceLoadChunk(world, cX, cZ);
         });
-        world.setKeepSpawnInMemory(true);
     }
 
     public static void resetWorld(){

FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java

@@ -20,11 +20,13 @@
 package de.steamwar.fightsystem.listener;
 
 import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -41,6 +43,12 @@ public class TestJoin implements Listener {
         Player player = event.getPlayer();
         FightTeam fightTeam = Fight.getPlayerTeam(player);
 
+        if(Config.ReplayID != 0 && !SteamwarUser.get(player.getUniqueId()).getUserGroup().isAdminGroup()) {
+            FightSystem.getMessage().send("CHECK_JOIN_DENIED", player);
+            player.kickPlayer("");
+            return;
+        }
+
         if (fightTeam == null && (Fight.getRedTeam().isLeaderless() || Fight.getBlueTeam().isLeaderless())) {
             FightSystem.getMessage().send("TEST_BECOME_LEADER", player);
         }

FightSystem_Core/src/de/steamwar/fightsystem/record/FileSource.java

@@ -38,21 +38,23 @@ public class FileSource extends PacketSource {
             return;
         }
 
-        de.steamwar.sql.Fight.getReplay(Config.ReplayID, input -> {
+        if(Config.ReplayID > 0) {
+            de.steamwar.sql.Fight.getReplay(Config.ReplayID, input -> {
+                try {
+                    Files.copy(
+                            input,
+                            FileRecorder.getFile().toPath(),
+                            StandardCopyOption.REPLACE_EXISTING);
+                } catch (IOException e) {
+                    throw new SecurityException("Could not start replay", e);
+                }
+            });
+
             try {
-                Files.copy(
+                new FileSource(FileRecorder.getFile());
-                        input,
-                        FileRecorder.getFile().toPath(),
-                        StandardCopyOption.REPLACE_EXISTING);
             } catch (IOException e) {
                 throw new SecurityException("Could not start replay", e);
             }
-        });
-
-        try {
-            new FileSource(FileRecorder.getFile());
-        } catch (IOException e) {
-            throw new SecurityException("Could not start replay", e);
         }
     }
 

FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.countdown.Countdown;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.fight.FightWorld;
 import de.steamwar.fightsystem.fight.FreezeWorld;
 import de.steamwar.fightsystem.listener.FightScoreboard;
 import de.steamwar.fightsystem.states.FightState;
@@ -124,6 +125,8 @@ public class PacketProcessor {
         packetDecoder[0xef] = source::readUTF;
         packetDecoder[0xff] = this::tick;
 
+        FightWorld.forceLoad();
+
         if(source.async()) {
             Bukkit.getScheduler().runTaskAsynchronously(FightSystem.getPlugin(), this::process);
             task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::runSync, 1, 1);