Skip to content

Flag Capture Region Dynamic Fix #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Flag Capture Region Dynamic Fix #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e6f183
Flag Capture Region Dynamic Fix
fenixJK May 10, 2025
3be7993
fix for capture region and placement
fenixJK May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/main/java/org/battleplugins/arena/ctf/arena/CtfCompetition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@

import net.kyori.adventure.text.Component;
import org.battleplugins.arena.ArenaPlayer;
import org.battleplugins.arena.BattleArena;
import org.battleplugins.arena.BattleArenaApi;
import org.battleplugins.arena.BattleArenaConfig;
import org.battleplugins.arena.competition.CompetitionType;
import org.battleplugins.arena.competition.LiveCompetition;
import org.battleplugins.arena.competition.map.MapType;
import org.battleplugins.arena.competition.map.options.Bounds;
import org.battleplugins.arena.ctf.ArenaCtf;
import org.battleplugins.arena.ctf.CtfMessages;
import org.battleplugins.arena.ctf.CtfUtil;
import org.battleplugins.arena.ctf.arena.CtfCompetition.ActiveFlag;
import org.battleplugins.arena.ctf.event.ArenaFlagCaptureEvent;
import org.battleplugins.arena.ctf.event.ArenaFlagReturnEvent;
import org.battleplugins.arena.messages.Message;
Expand All @@ -22,6 +28,7 @@
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import org.jetbrains.annotations.Nullable;
import org.bukkit.util.Vector;

import java.awt.Color;
import java.time.Duration;
Expand Down Expand Up @@ -113,7 +120,23 @@ public void tickFlags() {
continue;
}

if (flag.flag.getCaptureRegion().isInside(player.getLocation().toBlockLocation())) {
Bounds captureRegion = flag.flag.getCaptureRegion();
if (map.getType() == MapType.DYNAMIC && BattleArena.getInstance().getMainConfig().centerDynamicArena()) {
Bounds mapBounds = map.getBounds();
int offsetX = (mapBounds.getMinX() + mapBounds.getMaxX()) / 2;
int offsetZ = (mapBounds.getMinZ() + mapBounds.getMaxZ()) / 2;

captureRegion = new Bounds(
captureRegion.getMinX() - offsetX,
captureRegion.getMinY(),
captureRegion.getMinZ() - offsetZ,
captureRegion.getMaxX() - offsetX,
captureRegion.getMaxY(),
captureRegion.getMaxZ() - offsetZ
);
}

if (captureRegion.isInside(player.getLocation().toBlockLocation())) {
if (flag.team.equals(arenaPlayer.getTeam())) {
// Check to see if a player is holding the opposite team's flag
if (this.capturedFlags.containsKey(arenaPlayer)) {
Expand Down Expand Up @@ -312,6 +335,18 @@ public void placeFlag(float yaw) {
return;
}

if (map.getType() == MapType.DYNAMIC && BattleArena.getInstance().getMainConfig().centerDynamicArena()) {
Bounds bounds = map.getBounds();
Vector center = new Vector(
(bounds.getMinX() + bounds.getMaxX()) / 2.0,
bounds.getMinY(),
(bounds.getMinZ() + bounds.getMaxZ()) / 2.0
);

// Offset the flag location by the dynamic map's center
this.flagLocation = this.flagLocation.clone().subtract(center.getX(), 0, center.getZ());
}

Rotatable rotatable = (Rotatable) bannerMaterial.createBlockData();
rotatable.setRotation(this.flag.getBlockFace(yaw));
this.flagLocation.getBlock().setBlockData(rotatable);
Expand Down