From 79658bf3aa762d5042e77ab0e4ebc6a51f539a74 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 11 Sep 2021 18:31:58 +0200 Subject: [PATCH 1/4] Real spectator mode in own teamarea Signed-off-by: Lixfel --- .../de/steamwar/fightsystem/fight/Fight.java | 24 ++++--- .../fightsystem/listener/TeamArea.java | 70 ++++++++++++------- 2 files changed, 57 insertions(+), 37 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java index 4033521..591e631 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java @@ -123,16 +123,7 @@ public class Fight { Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> { if(!player.isOnline()) return; - PacketContainer gm1packet = ProtocolLibrary.getProtocolManager().createPacket(PacketType.Play.Server.PLAYER_INFO); - gm1packet.getPlayerInfoAction().write(0, EnumWrappers.PlayerInfoAction.UPDATE_GAME_MODE); - List playerInfoActions = new ArrayList<>(); - playerInfoActions.add(new PlayerInfoData(WrappedGameProfile.fromPlayer(player), 1, EnumWrappers.NativeGameMode.CREATIVE, WrappedChatComponent.fromText(player.getDisplayName()))); - gm1packet.getPlayerInfoDataLists().write(0, playerInfoActions); - try { - ProtocolLibrary.getProtocolManager().sendServerPacket(player, gm1packet); - } catch (InvocationTargetException e) { - Bukkit.getLogger().log(Level.SEVERE, "Invocation target exception", e); - } + pseudoSpectator(player, true); }, 2); }else if(gameMode == GameMode.SURVIVAL) { for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) { @@ -144,6 +135,19 @@ public class Fight { } } + public static void pseudoSpectator(Player player, boolean enable) { + PacketContainer gm1packet = ProtocolLibrary.getProtocolManager().createPacket(PacketType.Play.Server.PLAYER_INFO); + gm1packet.getPlayerInfoAction().write(0, EnumWrappers.PlayerInfoAction.UPDATE_GAME_MODE); + List playerInfoActions = new ArrayList<>(); + playerInfoActions.add(new PlayerInfoData(WrappedGameProfile.fromPlayer(player), 1, enable ? EnumWrappers.NativeGameMode.CREATIVE : EnumWrappers.NativeGameMode.SPECTATOR, WrappedChatComponent.fromText(player.getDisplayName()))); + gm1packet.getPlayerInfoDataLists().write(0, playerInfoActions); + try { + ProtocolLibrary.getProtocolManager().sendServerPacket(player, gm1packet); + } catch (InvocationTargetException e) { + Bukkit.getLogger().log(Level.SEVERE, "Invocation target exception", e); + } + } + public static int getMaxRank(){ /* MaxRank of 0 is Pubonly*/ if(Config.OnlyPublicSchematics){ diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java index db88f9f..6a06a8e 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java @@ -26,15 +26,18 @@ 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.fightsystem.utils.Region; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; import org.bukkit.GameMode; -import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; public class TeamArea implements Listener { @@ -42,6 +45,8 @@ public class TeamArea implements Listener { private static final String DENY_TEAM = "§cDu darfst nicht zu den Teams"; private static final String DENY_ENTERN = "§cDu darfst nicht entern"; + private static final Set realSpectator = new HashSet<>(); + public TeamArea() { new StateDependentListener(ArenaMode.AntiTest, FightState.All, this); } @@ -52,37 +57,48 @@ public class TeamArea implements Listener { if(player == FightSystem.getEventLeiter()) return; - Location to = event.getTo(); - assert to != null; - FightTeam team = Fight.getPlayerTeam(player); + checkInTeamRegion(event, Fight.getBlueTeam(), player, team); + checkInTeamRegion(event, Fight.getRedTeam(), player, team); + } - if(Config.BlueExtendRegion.playerInRegion(to)){ - if(team == null) - reset(event, DENY_TEAM); - else if(team == Fight.getRedTeam() && (player.getGameMode() == GameMode.SPECTATOR || !team.canPlayerEntern(player))) - reset(event, DENY_ENTERN); - else - return; // Is allowed in area - checkInInnerArea(event.getPlayer(), to, Fight.getBlueTeam()); - }else if(Config.RedExtendRegion.playerInRegion(to)){ - if(team == null) - reset(event, DENY_TEAM); - else if(team == Fight.getBlueTeam() && (player.getGameMode() == GameMode.SPECTATOR || !team.canPlayerEntern(player))) - reset(event, DENY_ENTERN); - else - return; // Is allowed in area - checkInInnerArea(event.getPlayer(), to, Fight.getRedTeam()); - }else{ - if(team != null && player.getGameMode() != GameMode.SPECTATOR && !team.canPlayerEntern(player) && !team.getExtendRegion().in2dRegion(to)) - reset(event, DENY_ENTERN); + @EventHandler + public void playerQuit(PlayerQuitEvent e) { + realSpectator.remove(e.getPlayer()); + } + + private void checkInTeamRegion(PlayerMoveEvent event, FightTeam team, Player player, FightTeam playerTeam) { + boolean spectator = player.getGameMode() == GameMode.SPECTATOR; + if(!spectator && playerTeam != null && playerTeam.canPlayerEntern(player)) + return; // Player can entern + + Region region = team.getExtendRegion(); + boolean inRegion = region.playerInRegion(event.getTo()); + if(team == playerTeam) { + if(spectator) { + realSpectator(inRegion, player); + } else if (!playerTeam.canPlayerEntern(player) && !inRegion) { + reset(event, DENY_ENTERN); // Leaving prior to entern + } + return; // Always allowed in own region + } + + if(inRegion) { + reset(event, DENY_TEAM); // Not allowed in region + if(team.getSchemRegion().playerInRegion(event.getTo()) && Config.PreperationArea >= 5){ // Preventing false positives due to small extension + player.kickPlayer(null); + Bukkit.getLogger().log(Level.INFO, player.getName() + " ist in einen Teambereich eingedrungen."); + } } } - 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.INFO, player.getName() + " ist in einen Teambereich eingedrungen."); + private void realSpectator(boolean inRegion, Player player) { + if(inRegion && !realSpectator.contains(player)) { + Fight.pseudoSpectator(player, false); + realSpectator.add(player); + }else if(!inRegion && realSpectator.contains(player)) { + Fight.pseudoSpectator(player, true); + realSpectator.remove(player); } } From 05d121fe63ad102c7ddabc78f07918096baba287 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 11 Sep 2021 22:27:28 +0200 Subject: [PATCH 2/4] Fix rotation Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java | 2 +- .../src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java | 2 +- .../src/de/steamwar/fightsystem/fight/FightSchematic.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java b/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java index 5d3b1e3..a91d4eb 100644 --- a/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java +++ b/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java @@ -106,7 +106,7 @@ public class WorldeditWrapper14 implements WorldeditWrapper.IWorldeditWrapper { ch.setTransform(aT); Operations.completeBlindly(ch.createPaste(e).to(BukkitAdapter.asVector(position).add( aT.apply(Vector3.at(offset.getX(), offset.getY(), offset.getZ()).add(clipboard.getOrigin().toVector3()).subtract(clipboard.getMinimumPoint().toVector3())) - ).round().toBlockPoint()).build()); + ).toBlockPoint()).build()); e.flushSession(); } diff --git a/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java b/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java index 356d51a..2264f2b 100644 --- a/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java +++ b/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java @@ -105,7 +105,7 @@ public class WorldeditWrapper8 implements WorldeditWrapper.IWorldeditWrapper { ch.setTransform(aT); Operations.completeBlindly(ch.createPaste(e, w.getWorldData()).to(new Vector(position.getX(), position.getY(), position.getZ()).add( aT.apply(new Vector(offset.getX(), offset.getY(), offset.getZ()).add(clipboard.getOrigin()).subtract(clipboard.getMinimumPoint())) - ).round().toBlockPoint()).build()); + ).toBlockPoint()).build()); e.flushQueue(); } diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java index 892728c..159317d 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java @@ -135,8 +135,8 @@ public class FightSchematic extends StateDependent { -(Config.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX() : dims.getBlockX())/2.0, Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0, -(Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ() : dims.getBlockZ())/2.0 - ), - new AffineTransform().rotateY(rotate ? 180 : 0).translate(rotate ? 0.5 : 0, 0, rotate ? 0.5 : 0) + ).add(new Vector(rotate ? 1 : 0, 0, rotate ? 1 : 0)), + new AffineTransform().rotateY(rotate ? 180 : 0) ); Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), freezer::disable, 3); From 194adf89700b93d8739b7cec36aab91b83f24fbb Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 16 Sep 2021 17:58:31 +0200 Subject: [PATCH 3/4] Fix laggy schemselect Signed-off-by: Lixfel --- .../de/steamwar/fightsystem/fight/Fight.java | 19 +------------------ .../steamwar/fightsystem/fight/FightTeam.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java index 4033521..c2e2965 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java @@ -30,7 +30,6 @@ import de.steamwar.fightsystem.ArenaMode; import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.FightSystem; import de.steamwar.fightsystem.record.GlobalRecorder; -import de.steamwar.sql.Schematic; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Sound; @@ -159,22 +158,6 @@ public class Fight { return 1000; } - if(Config.RanksEnabled) - return Math.min(schemRank(redTeam.getLeader()), schemRank(blueTeam.getLeader())); - else if(Schematic.getSchemsOfType(redTeam.getLeader().getPlayer().getUniqueId(), Config.SchematicType).isEmpty() || - Schematic.getSchemsOfType(blueTeam.getLeader().getPlayer().getUniqueId(), Config.SchematicType).isEmpty()) - return 0; - else - return 1; - } - - private static int schemRank(FightPlayer fightPlayer){ - int rank = 1; - List schematics = Schematic.getSchemsOfType(fightPlayer.getPlayer().getUniqueId(), Config.SchematicType); - for(Schematic schem : schematics){ - if(schem.getRank() > rank) - rank = schem.getRank(); - } - return rank; + return Math.min(redTeam.getSchemRank(), blueTeam.getSchemRank()); } } diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java index 0f80fe0..be1f4b5 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -48,6 +48,8 @@ public class FightTeam { private UUID designatedLeader; private FightPlayer leader; + private int schemRank; + private final Map players = new HashMap<>(); private final Set invited = new HashSet<>(); @@ -69,6 +71,7 @@ public class FightTeam { this.spawn = spawn; this.schemRegion = schemRegion; this.extendRegion = extendRegion; + this.schemRank = 0; this.ready = false; this.skip = false; this.blue = blue; @@ -112,6 +115,10 @@ public class FightTeam { return isLeaderless() && (designatedLeader == null || designatedLeader.equals(p.getUniqueId())); } + public int getSchemRank() { + return schemRank; + } + public void teleportToSpawn(){ players.forEach((player, fp) -> player.teleport(spawn)); } @@ -258,6 +265,12 @@ public class FightTeam { if(ready) setReady(false); + Optional maxRank = Schematic.getSchemsOfType(leader.getPlayer().getUniqueId(), Config.SchematicType).stream().map(Schematic::getRank).max(Integer::compare); + if(Config.RanksEnabled) + schemRank = maxRank.orElse(1); + else + schemRank = maxRank.isPresent() ? 1 : 0; + if(!Config.PersonalKits) leader.setKit(Kit.getKitByName(Config.LeaderDefault)); From 9c2a854a14ec4df58741c2070cb0e466350f2087 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Mon, 27 Sep 2021 17:01:18 +0200 Subject: [PATCH 4/4] SteamWarCI Signed-off-by: Lixfel --- steamwarci.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 steamwarci.yml diff --git a/steamwarci.yml b/steamwarci.yml new file mode 100644 index 0000000..a48cedd --- /dev/null +++ b/steamwarci.yml @@ -0,0 +1,6 @@ +build: + - "ln -s /home/gitea/lib" + - "mvn package -B" + +artifacts: + "/binarys/fightsystem.jar": "FightSystem_Main/target/fightsystem.jar"