Skip to content
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

Vulnerable directors #14

Closed
wants to merge 3 commits into from
Closed

Vulnerable directors #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cbc191
Delete .gitattributes
TylerS1066 Jul 23, 2024
611ea0e
Make directors vulnerable to raycasts
TylerS1066 Jul 25, 2024
82e50f6
Update TurretManager.java
TylerS1066 Jul 25, 2024
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
17 changes: 0 additions & 17 deletions .gitattributes
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ repositories {
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/")
maven { githubPackage("apdevteam/movecraft")(this) }
maven { githubPackage("apdevteam/movecraft-combat")(this) }
maven { githubPackage("apdevteam/movecraft-worldguard")(this) }
maven("https://jitpack.io")
maven("https://maven.enginehub.org/repo/")
Expand All @@ -20,6 +21,7 @@ dependencies {
api("org.jetbrains:annotations-java5:24.1.0")
paperweight.paperDevBundle("1.18.2-R0.1-SNAPSHOT")
compileOnly("net.countercraft:movecraft:+")
compileOnly("net.countercraft.movecraft.combat:movecraft-combat:+")
compileOnly("net.countercraft.movecraft.worldguard:movecraft-worldguard:+")
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.7")
compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
Expand Down
25 changes: 20 additions & 5 deletions src/main/java/com/snowleopard1863/APTurrets/TurretManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import com.sk89q.worldguard.protection.flags.Flags;
import com.snowleopard1863.APTurrets.config.Config;
import com.snowleopard1863.APTurrets.exception.ArrowLaunchException;
import net.countercraft.movecraft.combat.features.directors.Directors;
import net.countercraft.movecraft.craft.CraftManager;
import net.countercraft.movecraft.worldguard.MovecraftWorldGuard;
import net.countercraft.movecraft.worldguard.utils.WorldGuardUtils;
import net.countercraft.movecraft.worldguard.utils.WorldGuardUtils.State;

import net.minecraft.server.level.ServerLevel;
Expand Down Expand Up @@ -37,12 +39,13 @@
import org.jetbrains.annotations.Nullable;

import java.util.HashSet;
import java.util.Set;

import static com.snowleopard1863.APTurrets.TurretsMain.PREFIX;

public class TurretManager {
private final HashSet<Player> onTurrets = new HashSet<>();
private final HashSet<Player> reloading = new HashSet<>();
private final Set<Player> onTurrets = new HashSet<>();
private final Set<Player> reloading = new HashSet<>();

public void disable() {
for (Player p : onTurrets) {
Expand Down Expand Up @@ -205,11 +208,23 @@ private boolean runRaycast(@NotNull Player shooter) {
continue;

// Check for WG PVP flag
if (MovecraftWorldGuard.getInstance().getWGUtils().getState(null, p.getLocation(), Flags.PVP) == State.DENY)
continue;
WorldGuardUtils wgUtils = MovecraftWorldGuard.getInstance().getWGUtils();
if (wgUtils.getState(null, p.getLocation(), Flags.PVP) == State.DENY) {
// PVP flag is denied, check if they are a member, if so, exit
Set<String> regionNames = wgUtils.getRegions(p.getLocation());
boolean isMember = regionNames.stream().map(regionName -> wgUtils.isMember(regionName, p.getLocation().getWorld(), p)).reduce(Boolean.FALSE, Boolean::logicalOr);
if (isMember)
continue;

// Player is not a member, time to check if they are a director
if(!Directors.isAnyDirector(p))
continue;

// Player is a director, let them be hit!
}

// Check for block directly between
Block targetBlock = shooter.getTargetBlock(null, Config.RaycastRange);
Block targetBlock = shooter.getTargetBlock(Directors.Transparent, Config.RaycastRange);
if (targetBlock.getLocation().distanceSquared(shooterLoc) < distSquared)
continue;

Expand Down