Skip to content

Feature/only damage piloted #18

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
Intybyte wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Feature/only damage piloted #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fbe89c
Add #8
Intybyte Aug 26, 2024
267e4da
Simplify
Intybyte Aug 26, 2024
dc6c21e
Add burn listener
Intybyte Aug 26, 2024
a9b07c2
revert switch
Intybyte Aug 26, 2024
917a72a
Use mathUtils to convert location
Intybyte Aug 26, 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
2 changes: 2 additions & 0 deletions src/main/java/net/countercraft/movecraft/worldguard/CustomFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class CustomFlags {
public static final StateFlag ALLOW_CRAFT_SINK = new StateFlag("allow-craft-sink", false);
public static final StateFlag ALLOW_CRAFT_TRANSLATE = new StateFlag("allow-craft-translate", false);
public static final StateFlag ALLOW_CRAFT_REPAIR = new StateFlag("allow-craft-repair", false);
public static final StateFlag ONLY_DAMAGE_PILOTED_CRAFTS = new StateFlag("only-damage-piloted-crafts", false);

public static void register() {
try {
Expand All @@ -23,6 +24,7 @@ public static void register() {
registry.register(ALLOW_CRAFT_SINK);
registry.register(ALLOW_CRAFT_TRANSLATE);
registry.register(ALLOW_CRAFT_REPAIR);
registry.register(ONLY_DAMAGE_PILOTED_CRAFTS);
}
catch (Exception e) {
MovecraftWorldGuard.getInstance().getLogger().log(
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/countercraft/movecraft/worldguard/MovecraftWorldGuard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public void onEnable() {
getServer().getPluginManager().registerEvents(new CraftSinkListener(), this);
getServer().getPluginManager().registerEvents(new CraftTranslateListener(), this);
getServer().getPluginManager().registerEvents(new ExplosionListener(), this);
getServer().getPluginManager().registerEvents(new BurnListener(), this);
}

public WorldGuardUtils getWGUtils() {
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/net/countercraft/movecraft/worldguard/listener/BurnListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package net.countercraft.movecraft.worldguard.listener;

import net.countercraft.movecraft.MovecraftLocation;
import net.countercraft.movecraft.craft.CraftManager;
import net.countercraft.movecraft.util.MathUtils;
import net.countercraft.movecraft.worldguard.CustomFlags;
import net.countercraft.movecraft.worldguard.MovecraftWorldGuard;
import net.countercraft.movecraft.worldguard.utils.WorldGuardUtils;
import org.bukkit.Location;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBurnEvent;

public class BurnListener implements Listener {
@EventHandler
public void onBurn(BlockBurnEvent e) {
Location location = e.getBlock().getLocation();

var wgUtils = MovecraftWorldGuard.getInstance().getWGUtils();
WorldGuardUtils.State onlyDamagePilotedCrafts = wgUtils.getState(null, location, CustomFlags.ONLY_DAMAGE_PILOTED_CRAFTS);
if (onlyDamagePilotedCrafts != WorldGuardUtils.State.ALLOW) {
return;
}

MovecraftLocation movecraftLocation = MathUtils.bukkit2MovecraftLoc(location);
boolean burningCraft = CraftManager.getInstance().getCraftsInWorld(location.getWorld()).stream().anyMatch(it -> it.getHitBox().contains(movecraftLocation));

e.setCancelled(!burningCraft);
}
}
22 changes: 20 additions & 2 deletions src/main/java/net/countercraft/movecraft/worldguard/listener/ExplosionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
package net.countercraft.movecraft.worldguard.listener;

import com.sk89q.worldguard.protection.flags.Flags;
import net.countercraft.movecraft.MovecraftLocation;
import net.countercraft.movecraft.craft.CraftManager;
import net.countercraft.movecraft.events.ExplosionEvent;
import net.countercraft.movecraft.util.MathUtils;
import net.countercraft.movecraft.worldguard.CustomFlags;
import net.countercraft.movecraft.worldguard.MovecraftWorldGuard;
import net.countercraft.movecraft.worldguard.utils.WorldGuardUtils;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.Location;

public class ExplosionListener implements Listener {
@EventHandler
public void onExplosion(ExplosionEvent e) {
switch (MovecraftWorldGuard.getInstance().getWGUtils().getState(
null, e.getExplosionLocation(), Flags.OTHER_EXPLOSION)) {
var wgUtils = MovecraftWorldGuard.getInstance().getWGUtils();
Location explosionLocation = e.getExplosionLocation();

switch (wgUtils.getState(null, e.getExplosionLocation(), Flags.OTHER_EXPLOSION)) {
case ALLOW:
case NONE:
break; // Other-explosion is allowed
Expand All @@ -21,5 +29,15 @@ public void onExplosion(ExplosionEvent e) {
default:
break;
}

WorldGuardUtils.State onlyDamagePilotedCrafts = wgUtils.getState(null, explosionLocation, CustomFlags.ONLY_DAMAGE_PILOTED_CRAFTS);
if (onlyDamagePilotedCrafts != WorldGuardUtils.State.ALLOW) {
return;
}

MovecraftLocation movecraftLocation = MathUtils.bukkit2MovecraftLoc(explosionLocation);
boolean explodingOnCraft = CraftManager.getInstance().getCraftsInWorld(explosionLocation.getWorld()).stream().anyMatch(it -> it.getHitBox().contains(movecraftLocation));
Copy link
Contributor

@TylerS1066 TylerS1066 Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an inefficient method to do a check like this, please use the utility functions in WorldGuardUtils or a similar algorithm.

Copy link
Author

@Intybyte Intybyte Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't find any good function there that might help me in my case, maybe there is something useful in MathUtils


e.setCancelled(!explodingOnCraft);
}
}