Update PercentWincondition

@@ -98,6 +98,9 @@ public class FightSystem extends JavaPlugin {
         new WinconditionWaterTechKO();
         new WinconditionPercentSystem();
         new WinconditionRelativePercent();
+        if (Core.getVersion() >= 15) {

@@ -0,0 +32,4 @@
+        Set<Material> ignored = new HashSet<>();
+        for (String s : Config.IgnoredBlocks)
+            ignored.add(Material.valueOf(s));
+        ignoredBlocks = Collections.unmodifiableSet(ignored);

@@ -0,0 +45,4 @@
+        if (Config.ActiveWinconditions.contains(Winconditions.RELATIVE_REDSTONE_PERCENT)) {
+            printableWinconditions.add(this);
+            percentWincondition = this;
+            Bukkit.getPluginManager().registerEvents(this, FightSystem.getPlugin());

@@ -0,0 +56,4 @@
+
+    @Override
+    public String getDisplay(FightTeam team) {
+        return team.getPrefix() + "Schaden: " + (Math.round(100.0 * getPercent(team)) / 100.0) + "%";

@@ -0,0 +60,4 @@
+    }
+
+    @EventHandler
+    public void onBlockPlace(BlockPlaceEvent event) {

@@ -0,0 +70,4 @@
+        }
+    }
+
+    public static class TeamPercent extends StateDependent {

@@ -0,0 +81,4 @@
+            super(Winconditions.RELATIVE_REDSTONE_PERCENT, FightState.Running);
+            this.team = team;
+            this.currentBlocks = 1;
+            register();

@@ -0,0 +115,4 @@
+
+        private int currentBlocks() {
+            // Entern active
+            if (!Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())

@@ -0,0 +129,4 @@
+        }
+    }
+
+    private static boolean validBlock(Block block) {

@@ -0,0 +131,4 @@
+
+    private static boolean validBlock(Block block) {
+        Material material = block.getType();
+        if (ignoredBlocks.contains(material)) {

@@ -0,0 +141,4 @@
+                || blockData instanceof Rail) {
+            return true;
+        }
+        switch (material) {

@@ -190,0 +220,4 @@
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        });

@@ -26,0 +41,4 @@
+        return team.getPrefix() + "Schaden: " + (Math.round(100.0 * getPercent(team)) / 100.0) + "%";
+    }
+
+    abstract double getPercent(FightTeam team);

@@ -26,0 +52,4 @@
+        public int totalBlocks = 0;
+        private int currentBlocks = 0;
+
+        private Consumer<TeamPercent> explodeConsumer;

@@ -26,0 +62,4 @@
+            new OneShotStateDependent(wincondition, FightState.Running, () -> {
+                enableConsumer.accept(TeamPercent.this);
+                currentBlocks = totalBlocks;
+            }).register();

@@ -34,3 +30,3 @@
 import java.util.Map;
 
-public class WinconditionPercentSystem extends Wincondition implements Listener, PrintableWincondition, PercentWincondition {
+public class WinconditionPercentSystem extends PercentWincondition implements Listener {

@@ -129,0 +132,4 @@
+                teamPercent.totalBlocks = currentBlocks.get();
+            }, teamPercent -> {
+
+            });

@@ -41,4 +36,0 @@
-        Set<Material> ignored = new HashSet<>();
-        for(String s : Config.IgnoredBlocks)
-            ignored.add(Material.valueOf(s));
-        ignoredBlocks = Collections.unmodifiableSet(ignored);

@@ -126,0 +56,4 @@
+        return new PercentWincondition.TeamPercent(fightTeam, Winconditions.PERCENT_SYSTEM, material -> {
+            return !Config.Blocks.contains(material);
+        }, teamPercent -> {
+            AtomicInteger currentBlocks = new AtomicInteger();

@@ -0,0 +1,56 @@
+package de.steamwar.fightsystem.winconditions;

@@ -26,0 +69,4 @@
+                currentBlocks = totalBlocks;
+            });
+
+            new StateDependentListener(wincondition, FightState.Running, this).register();

@@ -56,3 +35,4 @@
+        if (Config.ActiveWinconditions.contains(Winconditions.PERCENT_SYSTEM)) {
             printableWinconditions.add(this);
             percentWincondition = this;
         }

@@ -129,0 +129,4 @@
+                        currentBlocks.getAndIncrement();
+                    }
+                });
+                teamPercent.totalBlocks = currentBlocks.get();

@@ -134,2 +137,2 @@
-            int ownBlocks = percent.getBlockCount();
-            int enemyBlocks = teamMap.get(Fight.getOpposite(team)).percent.getBlockCount();
+            int ownBlocks = percent.totalBlocks;
+            int enemyBlocks = teamMap.get(Fight.getOpposite(team)).percent.totalBlocks;

@@ -117,4 +44,0 @@
-        private int currentBlocks(){
-            // Entern active
-            if(!Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
-                return currentBlocks;

@@ -0,0 +43,4 @@
+    }
+
+    private PercentWincondition.TeamPercent create(FightTeam fightTeam) {
+        return new PercentWincondition.TeamPercent(fightTeam, Winconditions.PERCENT_SYSTEM, material -> {

@@ -0,0 +50,4 @@
+                if (Config.Blocks.contains(world.getBlockAt(x, y, z).getType())) {
+                    teamPercent.totalBlocks++;
+                }
+            });