forked from SteamWar/SteamWar
Fix EntityDamage only applying cancel for Player
This commit is contained in:
@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
|
|||||||
import de.steamwar.fightsystem.states.FightState;
|
import de.steamwar.fightsystem.states.FightState;
|
||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
import de.steamwar.fightsystem.states.StateDependentListener;
|
||||||
import de.steamwar.linkage.Linked;
|
import de.steamwar.linkage.Linked;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
@@ -38,11 +39,13 @@ public class EntityDamage implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void handleEntityDamage(EntityDamageEvent event) {
|
public void handleEntityDamage(EntityDamageEvent event) {
|
||||||
|
if (!(event.getEntity() instanceof Player)) return;
|
||||||
if (Config.ArenaRegion.in2dRegion(event.getEntity().getLocation())) event.setCancelled(true);
|
if (Config.ArenaRegion.in2dRegion(event.getEntity().getLocation())) event.setCancelled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void handleEntityDamageByEntity(EntityDamageByEntityEvent event) {
|
public void handleEntityDamageByEntity(EntityDamageByEntityEvent event) {
|
||||||
|
if (!(event.getEntity() instanceof Player)) return;
|
||||||
if (Config.ArenaRegion.in2dRegion(event.getEntity().getLocation())) event.setCancelled(true);
|
if (Config.ArenaRegion.in2dRegion(event.getEntity().getLocation())) event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,16 +30,6 @@ dependencies {
|
|||||||
implementation(project(":FightSystem:FightSystem_Core"))
|
implementation(project(":FightSystem:FightSystem_Core"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register<FightServer>("WarGear20") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a WarGear 1.20 Fight Server"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":FightSystem:shadowJar")
|
|
||||||
template = "WarGear20"
|
|
||||||
worldName = "arenas/Pentraki"
|
|
||||||
config = "WarGear20.yml"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register<FightServer>("HalloweenWS") {
|
tasks.register<FightServer>("HalloweenWS") {
|
||||||
group = "run"
|
group = "run"
|
||||||
description = "Run a Halloween 1.21 Fight Replay Server"
|
description = "Run a Halloween 1.21 Fight Replay Server"
|
||||||
@@ -63,23 +53,3 @@ tasks.register<FightServer>("WarGear21") {
|
|||||||
config = "WarGear21.yml"
|
config = "WarGear21.yml"
|
||||||
jar = "/jars/paper-1.21.6.jar"
|
jar = "/jars/paper-1.21.6.jar"
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register<FightServer>("SpaceCraftDev20") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a SpaceCraftDev 1.20 Fight Server"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":FightSystem:shadowJar")
|
|
||||||
template = "SpaceCraft20"
|
|
||||||
worldName = "arenas/AS_Horizon"
|
|
||||||
config = "SpaceCraftDev20.yml"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register<FightServer>("QuickGear20") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a QuickGear 1.20 Fight Server"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":FightSystem:shadowJar")
|
|
||||||
template = "QuickGear20"
|
|
||||||
worldName = "arenas/WarGearPark"
|
|
||||||
config = "QuickGear20.yml"
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user