FightSystem_10/src/de/steamwar/fightsystem/listener/DenyWorldInteraction_10.java

@@ -0,0 +1,32 @@
+/*
+    This file is a part of the SteamWar software.
+
+    Copyright (C) 2020  SteamWar.de-Serverteam
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package de.steamwar.fightsystem.listener;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+
+public class DenyWorldInteraction_10 implements Listener {
+
+    @EventHandler
+    public void onSwapItems(PlayerSwapHandItemsEvent event) {
+        event.setCancelled(true);
+    }
+}

FightSystem_12/src/de/steamwar/fightsystem/fight/FightTeam_12.java

@@ -19,12 +19,10 @@
 
 package de.steamwar.fightsystem.fight;
 
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.fightsystem.utils.Region;
 import org.bukkit.ChatColor;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
@@ -52,17 +50,25 @@ class FightTeam_12 {
         team.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
     }
 
+    static void replaceTeamColor(Clipboard clipboard, DyeColor c) throws WorldEditException {
+        FightTeam_8.replaceTeamColor(clipboard, c);
 
-    @SuppressWarnings("deprecation")
+        Vector minimum = clipboard.getRegion().getMinimumPoint();
-    static void replaceTeamColor(EditSession e, DyeColor c, Region r){
+        BaseBlock concrete = new BaseBlock(CONCRETE.getId(), c.getWoolData());
-        FightTeam_8.replaceTeamColor(e, c, r);
+        BaseBlock concretePowder = new BaseBlock(CONCRETE_POWDER.getId(), c.getWoolData());
-        CuboidRegion region = new CuboidRegion(new Vector(r.getMinX(), r.getMinY(), r.getMinZ()), new Vector(r.getMaxX(), r.getMaxY(), r.getMaxZ()));
+
-        try {
+        for(int x = 0; x < clipboard.getDimensions().getX(); x++){
-            e.replaceBlocks(region, CONCRETE_SET, new BaseBlock(CONCRETE.getId(), c.getWoolData()));
+            for(int y = 0; y < clipboard.getDimensions().getY(); y++){
-            e.replaceBlocks(region, CONCRETE_POWDER_SET, new BaseBlock(CONCRETE_POWDER.getId(), c.getWoolData()));
+                for(int z = 0; z < clipboard.getDimensions().getZ(); z++){
-        } catch (MaxChangedBlocksException ex) {
+                    Vector pos = minimum.add(x, y, z);
-            //ignored
+                    BaseBlock block = clipboard.getBlock(pos);
+                    if(block.equals(CONCRETE)){
+                        clipboard.setBlock(pos, concrete);
+                    }else if(block.equals(CONCRETE_POWDER)){
+                        clipboard.setBlock(pos, concretePowder);
+                    }
+                }
+            }
         }
-        e.flushQueue();
     }
 }

FightSystem_14/src/de/steamwar/fightsystem/fight/FightTeam_14.java

@@ -20,7 +20,6 @@
 package de.steamwar.fightsystem.fight;
 
 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.BukkitWorld;
@@ -50,43 +49,60 @@ import org.bukkit.scoreboard.Team;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Objects;
-import java.util.Set;
 
 public class FightTeam_14 {
     private FightTeam_14(){}
 
-    private static final Set<BaseBlock> WOOL_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_WOOL).getDefaultState().toBaseBlock());
+    private static final BaseBlock WOOL = Objects.requireNonNull(BlockTypes.PINK_WOOL).getDefaultState().toBaseBlock();
-    private static final Set<BaseBlock> CLAY_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_TERRACOTTA).getDefaultState().toBaseBlock());
+    private static final BaseBlock CLAY = Objects.requireNonNull(BlockTypes.PINK_TERRACOTTA).getDefaultState().toBaseBlock();
-    private static final Set<BaseBlock> GLASS_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS).getDefaultState().toBaseBlock());
+    private static final BaseBlock GLASS = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS).getDefaultState().toBaseBlock();
-    private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock());
+    private static final BaseBlock GLASS_PANE = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock();
-    private static final Set<BaseBlock> CONCRETE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock());
+    private static final BaseBlock CONCRETE = Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock();
-    private static final Set<BaseBlock> CONCRETE_POWDER_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock());
+    private static final BaseBlock CONCRETE_POWDER = Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock();
-    private static final Set<BaseBlock> CARPET_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock());
+    private static final BaseBlock CARPET = Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock();
 
     static void setTeamColor(Team team, ChatColor color){
         team.setColor(color);
         team.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
     }
 
-    static void replaceTeamColor(EditSession e, DyeColor c, Region r){
+    static void replaceTeamColor(Clipboard clipboard, DyeColor c) throws WorldEditException {
-        CuboidRegion region = new CuboidRegion(BlockVector3.at(r.getMinX(), r.getMinY(), r.getMinZ()), BlockVector3.at(r.getMaxX(), r.getMaxY(), r.getMaxZ()));
+        BlockVector3 minimum = clipboard.getRegion().getMinimumPoint();
-        try {
+        BaseBlock wool = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, WOOL_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock());
+        BaseBlock clay = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, CARPET_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_carpet")).getDefaultState().toBaseBlock());
+        BaseBlock glass = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, CLAY_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock());
+        BaseBlock glassPane = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, GLASS_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock());
+        BaseBlock carpet = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_carpet")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, GLASS_PANE_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock());
+        BaseBlock concrete = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_concrete")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, CONCRETE_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_concrete")).getDefaultState().toBaseBlock());
+        BaseBlock concretePowder = Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_concrete_powder")).getDefaultState().toBaseBlock();
-            e.replaceBlocks(region, CONCRETE_POWDER_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_concrete_powder")).getDefaultState().toBaseBlock());
+
-        } catch (MaxChangedBlocksException ex) {
+        for(int x = 0; x < clipboard.getDimensions().getX(); x++){
-            //ignored
+            for(int y = 0; y < clipboard.getDimensions().getY(); y++){
+                for(int z = 0; z < clipboard.getDimensions().getZ(); z++){
+                    BlockVector3 pos = minimum.add(x, y, z);
+                    BaseBlock block = clipboard.getFullBlock(pos);
+                    if(block.equals(WOOL)){
+                        clipboard.setBlock(pos, wool);
+                    }else if(block.equals(CLAY)){
+                        clipboard.setBlock(pos, clay);
+                    }else if(block.equals(GLASS)){
+                        clipboard.setBlock(pos, glass);
+                    }else if(block.equals(GLASS_PANE)){
+                        clipboard.setBlock(pos, glassPane);
+                    }else if(block.equals(CARPET)){
+                        clipboard.setBlock(pos, carpet);
+                    }else if(block.equals(CONCRETE)){
+                        clipboard.setBlock(pos, concrete);
+                    }else if(block.equals(CONCRETE_POWDER)){
+                        clipboard.setBlock(pos, concretePowder);
+                    }
+                }
+            }
         }
-        e.flushSession();
     }
 
-    static EditSession pasteSchematic(Clipboard clipboard, Region region, boolean rotate) throws Schematic.WrongVersionException, IOException, NoClipboardException {
+    static void pasteSchematic(Clipboard clipboard, Region region, boolean rotate) throws NoClipboardException {
         BlockVector3 paste = BlockVector3.at(region.centerX(), region.getMinY(), region.centerZ());
 
         World w = new BukkitWorld(Bukkit.getWorlds().get(0));
@@ -116,7 +132,6 @@ public class FightTeam_14 {
         ch.setTransform(aT);
         Operations.completeBlindly(ch.createPaste(e).to(v).build());
         e.flushSession();
-        return e;
     }
 
     public static boolean checkPistonMoving(Block block){

FightSystem_8/src/de/steamwar/fightsystem/fight/FightTeam_8.java

@@ -19,7 +19,10 @@
 
 package de.steamwar.fightsystem.fight;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+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.bukkit.BukkitWorld;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
@@ -45,8 +48,6 @@ import org.bukkit.scoreboard.Team;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
 
 public class FightTeam_8 {
     private FightTeam_8(){}
@@ -65,32 +66,40 @@ public class FightTeam_8 {
     @SuppressWarnings("deprecation")
     private static final BaseBlock CARPET = new BaseBlock(Material.CARPET.getId(), COLOR_TO_REPLACE);
 
-    private static final Set<BaseBlock> WOOL_SET = Collections.singleton(WOOL);
-    private static final Set<BaseBlock> CLAY_SET = Collections.singleton(CLAY);
-    private static final Set<BaseBlock> GLASS_SET = Collections.singleton(GLASS);
-    private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(GLASS_PANE);
-    private static final Set<BaseBlock> CARPET_SET = Collections.singleton(CARPET);
-
     static void setTeamColor(Team team, ChatColor color){
         team.setPrefix("§" + color.getChar());
     }
 
-    @SuppressWarnings("deprecation")
+    static void replaceTeamColor(Clipboard clipboard, DyeColor c) throws WorldEditException {
-    static void replaceTeamColor(EditSession e, DyeColor c, Region r){
+        Vector minimum = clipboard.getRegion().getMinimumPoint();
-        CuboidRegion region = new CuboidRegion(new Vector(r.getMinX(), r.getMinY(), r.getMinZ()), new Vector(r.getMaxX(), r.getMaxY(), r.getMaxZ()));
+        BaseBlock wool = new BaseBlock(WOOL.getId(), c.getWoolData());
-        try {
+        BaseBlock clay = new BaseBlock(CLAY.getId(), c.getWoolData());
-            e.replaceBlocks(region, WOOL_SET, new BaseBlock(WOOL.getId(), c.getWoolData()));
+        BaseBlock glass = new BaseBlock(GLASS.getId(), c.getWoolData());
-            e.replaceBlocks(region, CLAY_SET, new BaseBlock(CLAY.getId(), c.getWoolData()));
+        BaseBlock glassPane = new BaseBlock(GLASS_PANE.getId(), c.getWoolData());
-            e.replaceBlocks(region, GLASS_SET, new BaseBlock(GLASS.getId(), c.getWoolData()));
+        BaseBlock carpet =  new BaseBlock(CARPET.getId(), c.getWoolData());
-            e.replaceBlocks(region, GLASS_PANE_SET, new BaseBlock(GLASS_PANE.getId(), c.getWoolData()));
+
-            e.replaceBlocks(region, CARPET_SET, new BaseBlock(CARPET.getId(), c.getWoolData()));
+        for(int x = 0; x < clipboard.getDimensions().getX(); x++){
-        } catch (MaxChangedBlocksException ex) {
+            for(int y = 0; y < clipboard.getDimensions().getY(); y++){
-            // ignore, will never occur
+                for(int z = 0; z < clipboard.getDimensions().getZ(); z++){
+                    Vector pos = minimum.add(x, y, z);
+                    BaseBlock block = clipboard.getBlock(pos);
+                    if(block.equals(WOOL)){
+                        clipboard.setBlock(pos, wool);
+                    }else if(block.equals(CLAY)){
+                        clipboard.setBlock(pos, clay);
+                    }else if(block.equals(GLASS)){
+                        clipboard.setBlock(pos, glass);
+                    }else if(block.equals(GLASS_PANE)){
+                        clipboard.setBlock(pos, glassPane);
+                    }else if(block.equals(CARPET)){
+                        clipboard.setBlock(pos, carpet);
+                    }
+                }
+            }
         }
-        e.flushQueue();
     }
 
-    static EditSession pasteSchematic(Clipboard clipboard, Region paste, boolean rotate) throws Schematic.WrongVersionException, IOException, NoClipboardException {
+    static void pasteSchematic(Clipboard clipboard, Region paste, boolean rotate) throws NoClipboardException {
         World w = new BukkitWorld(Bukkit.getWorlds().get(0));
         Vector dimensions = clipboard.getDimensions();
         Vector v = new Vector(paste.centerX(), paste.getMinY(), paste.centerZ());
@@ -118,7 +127,6 @@ public class FightTeam_8 {
         ch.setTransform(aT);
         Operations.completeBlindly(ch.createPaste(e, w.getWorldData()).to(v).build());
         e.flushQueue();
-        return e;
     }
 
     public static boolean checkPistonMoving(Block block){

FightSystem_API/src/de/steamwar/fightsystem/utils/Region.java

@@ -19,12 +19,10 @@
 
 package de.steamwar.fightsystem.utils;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 
 import java.util.function.ObjIntConsumer;
-import java.util.logging.Level;
 
 public class Region {
 
@@ -37,11 +35,10 @@ public class Region {
 
     public Region(int minX, int minY, int minZ, int sizeX, int sizeY, int sizeZ, int extendX, int extendZ) {
         this(minX - extendX, minY, minZ - extendZ,
-                sizeX + extendX * 2, sizeY, sizeZ + extendZ * 2);
+             sizeX + extendX * 2, sizeY, sizeZ + extendZ * 2);
     }
 
     public Region(int minX, int minY, int minZ, int sizeX, int sizeY, int sizeZ) {
-        Bukkit.getLogger().log(Level.INFO, minX + " " + minY + " " + minZ + " " + sizeX + " " + sizeY + " " + sizeZ);
         this.minX = minX;
         this.minY = minY;
         this.minZ = minZ;
@@ -96,7 +93,7 @@ public class Region {
 
     public boolean chunkOutside(int cX, int cZ) {
         return getMinChunkX() > cX || cX > getMaxChunkX() ||
-                getMinChunkZ() > cZ || cZ > getMaxChunkZ();
+               getMinChunkZ() > cZ || cZ > getMaxChunkZ();
     }
 
     public void forEachChunk(ObjIntConsumer<Integer> executor) {

FightSystem_Main/src/de/steamwar/fightsystem/countdown/Countdown.java

@@ -77,6 +77,7 @@ public abstract class Countdown {
         time = totalTime;
         task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::count, 20, 20);
         currentCountdowns.add(this);
+        show();
     }
 
     public void disable() {
@@ -97,9 +98,10 @@ public abstract class Countdown {
                 smallestTime = countdown.time;
         }
 
-        smallestTime -= 2;
+        smallestTime--;
         for(Countdown countdown : currentCountdowns){
             countdown.time -= smallestTime;
+            countdown.show();
         }
 
         Bukkit.broadcastMessage(FightSystem.PREFIX + "§aBeide Teams waren damit einverstanden, zum nächsten Event zu beschleunigen!");
@@ -116,9 +118,12 @@ public abstract class Countdown {
         return time;
     }
 
-    void count(){
+    private void count() {
         time--;
+        show();
+    }
 
+    void show(){
         switch (time) {
             case 900: case 600: case 300: case 180: case 120:
                 broadcast("§rNoch §a" + time / 60 + " §rMinuten " + countdownCounting());

FightSystem_Main/src/de/steamwar/fightsystem/countdown/EnternCountdown.java

@@ -52,9 +52,7 @@ public class EnternCountdown extends Countdown {
     }
 
     @Override
-    void count(){
+    void show(){
-        time--;
-
         Player player = fightPlayer.getPlayer();
         switch (time) {
             case 900: case 600: case 300: case 180: case 120:

FightSystem_Main/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.fightsystem.fight;
 
-import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.VersionedRunnable;
 import de.steamwar.fightsystem.ArenaMode;
@@ -113,33 +113,34 @@ public class FightSchematic extends StateDependent {
 
     private void paste(){
         FreezeWorld freezer = new FreezeWorld();
-        DyeColor c = ColorConverter.chat2dye(team.getColor());
+        DyeColor c = ArenaMode.AntiPrepare.contains(Config.mode) ? ColorConverter.chat2dye(team.getColor()) : DyeColor.PINK;
 
         try {
             VersionedRunnable.call(new VersionedRunnable(() -> {
                 try {
-                    EditSession e = FightTeam_8.pasteSchematic(clipboard, region, rotate);
+                    FightTeam_8.replaceTeamColor(clipboard, c);
-                    FightTeam_8.replaceTeamColor(e, c, region);
+                    FightTeam_8.pasteSchematic(clipboard, region, rotate);
-                } catch (Schematic.WrongVersionException | IOException | NoClipboardException ex) {
+                } catch (NoClipboardException | WorldEditException ex) {
-                    throw new SecurityException("Error pasting arena in schematic", ex);
+                    throw new SecurityException("Error pasting schematic", ex);
                 }
             }, 8), new VersionedRunnable(() -> {
                 try {
-                    EditSession e = FightTeam_8.pasteSchematic(clipboard, region, rotate);
+                    FightTeam_12.replaceTeamColor(clipboard, c);
-                    FightTeam_12.replaceTeamColor(e, c, region);
+                    FightTeam_8.pasteSchematic(clipboard, region, rotate);
-                } catch (Schematic.WrongVersionException | IOException | NoClipboardException ex) {
+                } catch (NoClipboardException | WorldEditException ex) {
-                    throw new SecurityException("Error pasting arena in schematic", ex);
+                    throw new SecurityException("Error pasting schematic", ex);
                 }
             }, 12), new VersionedRunnable(() -> {
                 try {
-                    EditSession e = FightTeam_14.pasteSchematic(clipboard, region, rotate);
+                    FightTeam_14.replaceTeamColor(clipboard, c);
-                    FightTeam_14.replaceTeamColor(e, c, region);
+                    FightTeam_14.pasteSchematic(clipboard, region, rotate);
-                } catch (Schematic.WrongVersionException | IOException | NoClipboardException ex) {
+                } catch (NoClipboardException | WorldEditException ex) {
-                    throw new SecurityException("Error pasting arena in schematic", ex);
+                    throw new SecurityException("Error pasting schematic", ex);
                 }
             }, 14));
         } catch (SecurityException securityException) {
-            team.broadcast(FightSystem.PREFIX + "§cFehler beim Pasten der Schematic");
+            Bukkit.broadcastMessage(FightSystem.PREFIX + "§cFehler beim Pasten der Schematic");
+            Bukkit.getScheduler().runTask(FightSystem.getPlugin(), FightSystem::setPreSchemState);
             throw securityException;
         }
 

FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -94,6 +94,10 @@ public class FightTeam implements IFightTeam{
         team.setAllowFriendlyFire(false);
     }
 
+    public UUID getDesignatedLeader(){
+        return designatedLeader;
+    }
+
     public Region getSchemRegion() {
         return schemRegion;
     }

FightSystem_Main/src/de/steamwar/fightsystem/listener/ArenaBorder.java

@@ -51,8 +51,11 @@ public class ArenaBorder implements Listener {
         }
 
         FightTeam team = Fight.getPlayerTeam(player);
-        if(team == null || player.getGameMode() == GameMode.SPECTATOR)
+        if(team == null || player.getGameMode() == GameMode.SPECTATOR){
+            if(to.getY() <= Config.ArenaRegion.getMinY())
+                reset(event);
             return;
+        }
 
         if(to.getY() <= Config.ArenaRegion.getMinY()) {
             if(FightState.infight())

FightSystem_Main/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.fightsystem.listener;
 
+import de.steamwar.core.Core;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
@@ -39,6 +40,11 @@ public class DenyWorldInteraction implements Listener {
     public DenyWorldInteraction() {
         new StateDependentListener(ArenaMode.Test, FightState.PreRunning, this);
         new StateDependentListener(ArenaMode.AntiTest, FightState.AntiRunning, this);
+        if(Core.getVersion() > 9){
+            Listener listener = new DenyWorldInteraction_10();
+            new StateDependentListener(ArenaMode.Test, FightState.PreRunning, listener);
+            new StateDependentListener(ArenaMode.AntiTest, FightState.AntiRunning, listener);
+        }
     }
 
     @EventHandler
@@ -68,13 +74,13 @@ public class DenyWorldInteraction implements Listener {
 
     @EventHandler
     public void onInventoryClick(InventoryClickEvent event) {
-        if(PersonalKitCreator.notInKitCreator(event.getWhoClicked()))
+        if(!PersonalKitCreator.inKitCreator(event.getWhoClicked()))
             event.setCancelled(true);
     }
 
     @EventHandler
     public void onInventoryDrag(InventoryDragEvent event) {
-        if(PersonalKitCreator.notInKitCreator(event.getWhoClicked()))
+        if(!PersonalKitCreator.inKitCreator(event.getWhoClicked()))
             event.setCancelled(true);
     }
 

FightSystem_Main/src/de/steamwar/fightsystem/listener/FightScoreboard.java

@@ -77,14 +77,6 @@ public class FightScoreboard implements Listener, ScoreboardCallback {
         SWScoreboard.removeScoreboard(event.getPlayer());
     }
 
-    private void teamScoreboard(FightTeam fightTeam){
-        setTitle(fightTeam.getColoredName());
-        fightTeam.getPlayers().forEach(fp -> {
-            if(fp.isLiving())
-                addScore(fightTeam.getPrefix() + fp.getPlayer().getName(), (int) Math.ceil(fp.getPlayer().getHealth()));
-        });
-    }
-
     private void generalScoreboard(){
         setTitle("§eKampf");
         List<String> scoreList = new ArrayList<>();
@@ -113,19 +105,23 @@ public class FightScoreboard implements Listener, ScoreboardCallback {
         }
     }
 
+    private void teamScoreboard(FightTeam fightTeam){
+        fightTeam.getPlayers().forEach(fp -> {
+            if(fp.isLiving())
+                addScore(fightTeam.getPrefix() + fp.getPlayer().getName(), (int) Math.ceil(fp.getPlayer().getHealth()));
+        });
+    }
+
     private void updateScoreboard() {
         if(replaying)
             return;
 
-        switch((index++ / 10) % 3){
+        if ((index++ / 5) % 2 == 0) {
-            case 0:
+            generalScoreboard();
-                generalScoreboard();
+        } else {
-                break;
+            setTitle(Fight.getBlueTeam().getColoredName() + " " + Fight.getRedTeam().getColoredName());
-            case 1:
+            teamScoreboard(Fight.getBlueTeam());
-                teamScoreboard(Fight.getBlueTeam());
+            teamScoreboard(Fight.getRedTeam());
-                break;
-            case 2:
-                teamScoreboard(Fight.getRedTeam());
         }
     }
 

FightSystem_Main/src/de/steamwar/fightsystem/listener/HotbarGUI.java

@@ -42,17 +42,17 @@ public class HotbarGUI implements Listener {
     public void handlePlayerInteract(PlayerInteractEvent event) {
         Player player = event.getPlayer();
 
-        if(!PersonalKitCreator.notInKitCreator(player))
+        if(PersonalKitCreator.inKitCreator(player))
             return;
 
         if(event.getItem() == null)
             return;
 
+        event.setCancelled(true);
         FightTeam fightTeam = Fight.getPlayerTeam(player);
         if(fightTeam == null)
             return;
 
-        event.setCancelled(true);
         ItemMeta itemMeta = event.getItem().getItemMeta();
         String displayName = itemMeta.getDisplayName();
 

FightSystem_Main/src/de/steamwar/fightsystem/listener/InFightInventory.java

@@ -29,6 +29,7 @@ import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
@@ -123,4 +124,10 @@ public class InFightInventory implements Listener {
             e.setCancelled(true);
         }
     }
+
+    @EventHandler
+    public void onBlockDispense(BlockDispenseEvent e) {
+        if(e.getItem().getType() == Material.TNT)
+            e.setCancelled(true);
+    }
 }

FightSystem_Main/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java

@@ -61,8 +61,8 @@ public class PersonalKitCreator implements Listener {
         BasicListener.toActionbar(player, TextComponent.fromLegacyText("§eInventar zum Anpassen des Kits öffnen§8!"));
     }
 
-    public static boolean notInKitCreator(HumanEntity player){
+    public static boolean inKitCreator(HumanEntity player){
-        return !openKitCreators.containsKey(player);
+        return openKitCreators.containsKey(player);
     }
 
     public static void closeIfInKitCreator(HumanEntity player){

FightSystem_Main/src/de/steamwar/fightsystem/listener/PistonListener.java

@@ -39,9 +39,8 @@ public class PistonListener implements Listener {
 
     @EventHandler
     public void handlePistonExtend(BlockPistonExtendEvent e){
-        BlockFace b = e.getDirection().getOppositeFace();
         for(Block block : e.getBlocks()){
-            if(!Config.BlueExtendRegion.inRegion(block.getRelative(b)) && !Config.RedExtendRegion.inRegion(block.getRelative(b))){
+            if(!Config.BlueExtendRegion.inRegion(block) && !Config.RedExtendRegion.inRegion(block)){
                 e.setCancelled(true);
                 return;
             }
@@ -50,9 +49,8 @@ public class PistonListener implements Listener {
 
     @EventHandler
     public void handlePistonRetract(BlockPistonRetractEvent e){
-        BlockFace b = e.getDirection().getOppositeFace();
         for(Block block : e.getBlocks()){
-            if(!Config.BlueExtendRegion.inRegion(block.getRelative(b)) && !Config.RedExtendRegion.inRegion(block.getRelative(b))) {
+            if(!Config.BlueExtendRegion.inRegion(block) && !Config.RedExtendRegion.inRegion(block)) {
                 e.setCancelled(true);
                 return;
             }

FightSystem_Main/src/de/steamwar/fightsystem/listener/TeamArea.java

@@ -82,7 +82,7 @@ public class TeamArea implements Listener {
     private void checkInInnerArea(Player player, Location to, FightTeam team){
         if(team.getSchemRegion().playerInRegion(to) && Config.PreperationArea >= 5){ // Preventing false positives due to small extension
             player.kickPlayer(null);
-            Bukkit.getLogger().log(Level.SEVERE, player.getName() + " ist in einen Teambereich eingedrungen.");
+            Bukkit.getLogger().log(Level.INFO, player.getName() + " ist in einen Teambereich eingedrungen.");
         }
     }
 

FightSystem_Main/src/de/steamwar/fightsystem/utils/FightStatistics.java

@@ -50,12 +50,8 @@ public class FightStatistics {
     public static void saveStats(FightTeam winner, String windescription){
         String gameMode = Config.SchematicType.toDB();
 
-        int blueLeader = 0;
+        int blueLeader = getLeader(Fight.getBlueTeam());
-        int redLeader = 0;
+        int redLeader = getLeader(Fight.getRedTeam());
-        if(Fight.getBlueTeam().getLeader() != null)
-            blueLeader = SteamwarUser.get(Fight.getBlueTeam().getLeader().getPlayer().getUniqueId()).getId();
-        if(Fight.getRedTeam().getLeader() != null)
-            redLeader = SteamwarUser.get(Fight.getRedTeam().getLeader().getPlayer().getUniqueId()).getId();
 
         int win = 0;
         double blueResult;
@@ -109,11 +105,19 @@ public class FightStatistics {
             int newRedElo = (int) Math.round(redElo + K * (1 - blueResult - redWinExpectation));
             Elo.setElo(blueLeader, gameMode, newBlueElo);
             Elo.setElo(redLeader, gameMode, newRedElo);
-            Bukkit.broadcastMessage(FightSystem.PREFIX + "§7ELO von " + Fight.getBlueTeam().getPrefix() + Fight.getBlueTeam().getLeader().getPlayer().getName() + "§8: §7" + blueElo + "§8»§e" + newBlueElo);
+            Bukkit.broadcastMessage(FightSystem.PREFIX + "§7ELO von " + Fight.getBlueTeam().getPrefix() + SteamwarUser.get(blueLeader).getUserName() + "§8: §7" + blueElo + "§8»§e" + newBlueElo);
-            Bukkit.broadcastMessage(FightSystem.PREFIX + "§7ELO von " + Fight.getRedTeam().getPrefix() + Fight.getRedTeam().getLeader().getPlayer().getName() + "§8: §7" + redElo + "§8»§e" + newRedElo);
+            Bukkit.broadcastMessage(FightSystem.PREFIX + "§7ELO von " + Fight.getRedTeam().getPrefix() + SteamwarUser.get(redLeader).getUserName() + "§8: §7" + redElo + "§8»§e" + newRedElo);
         }
     }
 
+    private static int getLeader(FightTeam team){
+        if(team.getLeader() != null)
+            return SteamwarUser.get(team.getLeader().getPlayer().getUniqueId()).getId();
+        else if(team.getDesignatedLeader() != null)
+            return SteamwarUser.get(team.getDesignatedLeader()).getId();
+        return 0;
+    }
+
     private static void savePlayerStats(FightPlayer fp, int fightId){
         SteamwarUser user = SteamwarUser.get(fp.getPlayer().getUniqueId());
         de.steamwar.sql.FightPlayer.create(fightId, user.getId(), fp.getTeam().isBlue(), fp.getKit().getName(), fp.getKills(), !fp.isLiving());