From 6ed091e9b4d786062971d9557d1e59d403ff5d19 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 21 Jul 2022 22:46:09 +0200 Subject: [PATCH 1/4] HellsBells improvements Signed-off-by: Lixfel --- .../de/steamwar/fightsystem/event/HellsBells.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java b/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java index 4b61b8f..85d9260 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java @@ -43,8 +43,8 @@ public class HellsBells { public static final Random random = new Random(); - private final int xLength = Config.RedExtendRegion.getMaxX() - Config.RedExtendRegion.getMinX(); - private final int zLength = Config.RedExtendRegion.getMaxZ() - Config.RedExtendRegion.getMinZ(); + private final int xLength = Config.BluePasteRegion.getSizeX(); + private final int zLength = Config.BluePasteRegion.getSizeZ(); private State current = State.PRE; private int currentDrops = 0; private HellsBellsCountdown currentCountdown; @@ -87,11 +87,11 @@ public class HellsBells { Point blueStart; if (direction.isNorthOrWest()) { - redStart = new Point(Config.RedExtendRegion.getMaxX() - xOffset, Config.RedExtendRegion.getMaxY() + yOffset, Config.RedExtendRegion.getMaxZ() - zOffset); - blueStart = new Point(Config.BlueExtendRegion.getMinX() + xOffset, Config.BlueExtendRegion.getMaxY() + yOffset, Config.BlueExtendRegion.getMinZ() + zOffset); + redStart = new Point(Config.RedPasteRegion.getMaxX() - xOffset, Config.RedPasteRegion.getMaxY() + yOffset, Config.RedPasteRegion.getMaxZ() - zOffset); + blueStart = new Point(Config.BluePasteRegion.getMinX() + xOffset, Config.BluePasteRegion.getMaxY() + yOffset, Config.BluePasteRegion.getMinZ() + zOffset); } else { - redStart = new Point(Config.RedExtendRegion.getMinX() + xOffset, Config.RedExtendRegion.getMaxY() + yOffset, Config.RedExtendRegion.getMinZ() + zOffset); - blueStart = new Point(Config.BlueExtendRegion.getMaxX() - xOffset, Config.BlueExtendRegion.getMaxY() + yOffset, Config.BlueExtendRegion.getMaxZ() - zOffset); + redStart = new Point(Config.RedPasteRegion.getMinX() + xOffset, Config.RedPasteRegion.getMaxY() + yOffset, Config.RedPasteRegion.getMinZ() + zOffset); + blueStart = new Point(Config.BluePasteRegion.getMaxX() - xOffset, Config.BluePasteRegion.getMaxY() + yOffset, Config.BluePasteRegion.getMaxZ() - zOffset); } currentDropping = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), () -> { @@ -126,6 +126,8 @@ public class HellsBells { new StateDependent(Winconditions.HELLS_BELLS, FightState.Running) { @Override public void enable() { + current = State.PRE; + currentDrops = 0; startCountdown(); } From 62ebb0657cf3682f1c0490a3b36c1f496868a92f Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 22 Jul 2022 10:14:28 +0200 Subject: [PATCH 2/4] Add gaussian distribution --- .../de/steamwar/fightsystem/event/HellsBells.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java b/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java index 85d9260..7fe7e4b 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java @@ -43,8 +43,8 @@ public class HellsBells { public static final Random random = new Random(); - private final int xLength = Config.BluePasteRegion.getSizeX(); - private final int zLength = Config.BluePasteRegion.getSizeZ(); + private final int xLength = Config.BlueExtendRegion.getSizeX(); + private final int zLength = Config.BlueExtendRegion.getSizeZ(); private State current = State.PRE; private int currentDrops = 0; private HellsBellsCountdown currentCountdown; @@ -87,11 +87,11 @@ public class HellsBells { Point blueStart; if (direction.isNorthOrWest()) { - redStart = new Point(Config.RedPasteRegion.getMaxX() - xOffset, Config.RedPasteRegion.getMaxY() + yOffset, Config.RedPasteRegion.getMaxZ() - zOffset); - blueStart = new Point(Config.BluePasteRegion.getMinX() + xOffset, Config.BluePasteRegion.getMaxY() + yOffset, Config.BluePasteRegion.getMinZ() + zOffset); + redStart = new Point(Config.RedExtendRegion.getMaxX() - xOffset, Config.RedExtendRegion.getMaxY() + yOffset, Config.RedExtendRegion.getMaxZ() - zOffset); + blueStart = new Point(Config.BlueExtendRegion.getMinX() + xOffset, Config.BlueExtendRegion.getMaxY() + yOffset, Config.BlueExtendRegion.getMinZ() + zOffset); } else { - redStart = new Point(Config.RedPasteRegion.getMinX() + xOffset, Config.RedPasteRegion.getMaxY() + yOffset, Config.RedPasteRegion.getMinZ() + zOffset); - blueStart = new Point(Config.BluePasteRegion.getMaxX() - xOffset, Config.BluePasteRegion.getMaxY() + yOffset, Config.BluePasteRegion.getMaxZ() - zOffset); + redStart = new Point(Config.RedExtendRegion.getMinX() + xOffset, Config.RedExtendRegion.getMaxY() + yOffset, Config.RedExtendRegion.getMinZ() + zOffset); + blueStart = new Point(Config.BlueExtendRegion.getMaxX() - xOffset, Config.BlueExtendRegion.getMaxY() + yOffset, Config.BlueExtendRegion.getMaxZ() - zOffset); } currentDropping = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), () -> { @@ -113,7 +113,7 @@ public class HellsBells { } private int getStart(int regionSize, int length) { - double randomNumber = (random.nextDouble() - random.nextDouble()) / 2 + 0.5; + double randomNumber = (Math.max(Math.min(random.nextGaussian(), -2), 2) + 2) / 4; Bukkit.getLogger().log(Level.INFO, "Calculated Start: " + (int) (randomNumber * (regionSize - length))); return Math.max(Math.min((int) (randomNumber * (regionSize - length)), regionSize - length), 0); } From 6b40f43f7325b1129c3343f99bc4a42886dc6d00 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 5 Aug 2022 07:10:59 +0200 Subject: [PATCH 3/4] 1.19.1 Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java b/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java index 5193f15..8c87581 100644 --- a/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java +++ b/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java @@ -53,7 +53,7 @@ public class CraftbukkitWrapper19 implements CraftbukkitWrapper { @Override public float headRotation(Entity e) { - return ((CraftEntity)e).getHandle().ch(); + return ((CraftEntity)e).getHandle().cg(); } @Override From 353243e42bcf1b5cf670824bad2ef7ccc4565c9f Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 20 Aug 2022 17:47:44 +0200 Subject: [PATCH 4/4] Remove ForceResourcepack Signed-off-by: Lixfel --- .../de/steamwar/fightsystem/FightSystem.java | 1 - .../fightsystem/FightSystem.properties | 1 - .../fightsystem/FightSystem_de.properties | 1 - .../fightsystem/listener/ResourcePack.java | 35 ------------------- 4 files changed, 38 deletions(-) delete mode 100644 FightSystem_Core/src/de/steamwar/fightsystem/listener/ResourcePack.java diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java index b449484..f5e2d78 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java @@ -77,7 +77,6 @@ public class FightSystem extends JavaPlugin { new DenyInventoryMovement(); new EventJoin(); new Recording(); - //new ResourcePack(); new Check(); new Shutdown(); new SetupQuit(); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties index ae4ae52..126d650 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties +++ b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties @@ -145,7 +145,6 @@ NO_FRIENDLY_FIRE=§cNo friendly fire allowed NO_TNT_PLACE=§cYou are not allowed to place tnt NO_TELEPORT=§cYou are not allowed to use this teleport function OPEN_INVENTORY_TO_CUSTOMIZE=§eOpen inventory to customize your kit -RESOURCEPACK_REQUIRED=§cYou can only join on the event server with the SteamWar resourcepack\n§cPlease allow the use of server resourcepacks in the server list! NO_ENTERN=§cYou may not board NO_TEAMAREA=§cYou are not allowed in the team area TEST_BECOME_LEADER=§7Become a team leader with §8/§eleader diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties index 166ddc8..082f69f 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties +++ b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties @@ -142,7 +142,6 @@ NO_FRIENDLY_FIRE=§cDu darfst deinen Teamkollegen keinen Schaden zufügen NO_TNT_PLACE=§cDu darfst kein TNT setzen NO_TELEPORT=§cDu darfst diese Teleportfunktion nicht benutzen OPEN_INVENTORY_TO_CUSTOMIZE=§eInventar zum Anpassen des Kits öffnen -RESOURCEPACK_REQUIRED=§cAuf Eventserver kann nur mit dem SteamWar-Resourcepack beigetreten werden\n§cDa du abgelehnt hast, musst du nun in der Serverliste erst einmal wieder Ressourcenpakete von SteamWar aktivieren NO_ENTERN=§cDu darfst nicht entern NO_TEAMAREA=§cDu darfst nicht zu den Teams TEST_BECOME_LEADER=§7Werde zum Teamleader mit §8/§eleader diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/ResourcePack.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/ResourcePack.java deleted file mode 100644 index 80bb614..0000000 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/ResourcePack.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.steamwar.fightsystem.listener; - -import de.steamwar.fightsystem.ArenaMode; -import de.steamwar.fightsystem.FightSystem; -import de.steamwar.fightsystem.states.FightState; -import de.steamwar.fightsystem.states.StateDependentListener; -import de.steamwar.fightsystem.utils.CraftbukkitWrapper; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerResourcePackStatusEvent; - -public class ResourcePack implements Listener { - - public ResourcePack(){ - new StateDependentListener(ArenaMode.Event, FightState.All, this); - } - - @EventHandler - public void handlePlayerJoin(PlayerJoinEvent event) { - Player player = event.getPlayer(); - CraftbukkitWrapper.impl.sendResourcePack(player, "https://steamwar.de/antixray.zip", "3e94f5abeb07cc95067b27705615ec14666abe7b"); - } - - @EventHandler - public void onResourcepack(PlayerResourcePackStatusEvent e){ - if(e.getStatus() == PlayerResourcePackStatusEvent.Status.ACCEPTED || e.getStatus() == PlayerResourcePackStatusEvent.Status.SUCCESSFULLY_LOADED) - return; - - Player player = e.getPlayer(); - FightSystem.getMessage().sendPrefixless("RESOURCEPACK_REQUIRED", player); - player.kickPlayer(null); - } -}