Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the involved entities in PreventPvPEvent (#1186)

Browse Source
This commit is contained in:
Frank van der Heijden 2021-01-09 18:11:28 +01:00 committed by GitHub
parent 2f0f98db25
commit e95b7986e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -819,7 +819,7 @@ public class EntityEventHandler implements Listener
damagedData.lastClaim = damagedClaim; damagedData.lastClaim = damagedClaim;
if (GriefPrevention.instance.claimIsPvPSafeZone(damagedClaim)) if (GriefPrevention.instance.claimIsPvPSafeZone(damagedClaim))
{ {
PreventPvPEvent pvpEvent = new PreventPvPEvent(damagedClaim); PreventPvPEvent pvpEvent = new PreventPvPEvent(damagedClaim, attacker, damaged);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
@ -887,7 +887,7 @@ public class EntityEventHandler implements Listener
GriefPrevention.instance.claimIsPvPSafeZone(attackerClaim)) GriefPrevention.instance.claimIsPvPSafeZone(attackerClaim))
{ {
attackerData.lastClaim = attackerClaim; attackerData.lastClaim = attackerClaim;
PreventPvPEvent pvpEvent = new PreventPvPEvent(attackerClaim); PreventPvPEvent pvpEvent = new PreventPvPEvent(attackerClaim, attacker, defender);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
@ -904,7 +904,7 @@ public class EntityEventHandler implements Listener
GriefPrevention.instance.claimIsPvPSafeZone(defenderClaim)) GriefPrevention.instance.claimIsPvPSafeZone(defenderClaim))
{ {
defenderData.lastClaim = defenderClaim; defenderData.lastClaim = defenderClaim;
PreventPvPEvent pvpEvent = new PreventPvPEvent(defenderClaim); PreventPvPEvent pvpEvent = new PreventPvPEvent(defenderClaim, attacker, defender);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
@ -947,7 +947,7 @@ public class EntityEventHandler implements Listener
GriefPrevention.instance.claimIsPvPSafeZone(defenderClaim)) GriefPrevention.instance.claimIsPvPSafeZone(defenderClaim))
{ {
defenderData.lastClaim = defenderClaim; defenderData.lastClaim = defenderClaim;
PreventPvPEvent pvpEvent = new PreventPvPEvent(defenderClaim); PreventPvPEvent pvpEvent = new PreventPvPEvent(defenderClaim, attacker, defender);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
//if other plugins aren't making an exception to the rule //if other plugins aren't making an exception to the rule
@ -1047,7 +1047,7 @@ public class EntityEventHandler implements Listener
message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement);
if (sendErrorMessagesToPlayers) if (sendErrorMessagesToPlayers)
GriefPrevention.sendMessage(attacker, TextMode.Err, message); GriefPrevention.sendMessage(attacker, TextMode.Err, message);
PreventPvPEvent pvpEvent = new PreventPvPEvent(new Claim(subEvent.getEntity().getLocation(), subEvent.getEntity().getLocation(), null, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), null)); PreventPvPEvent pvpEvent = new PreventPvPEvent(new Claim(subEvent.getEntity().getLocation(), subEvent.getEntity().getLocation(), null, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), null), attacker, tameable);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
@ -1441,7 +1441,7 @@ public class EntityEventHandler implements Listener
if (attackerClaim != null && GriefPrevention.instance.claimIsPvPSafeZone(attackerClaim)) if (attackerClaim != null && GriefPrevention.instance.claimIsPvPSafeZone(attackerClaim))
{ {
attackerData.lastClaim = attackerClaim; attackerData.lastClaim = attackerClaim;
PreventPvPEvent pvpEvent = new PreventPvPEvent(attackerClaim); PreventPvPEvent pvpEvent = new PreventPvPEvent(attackerClaim, thrower, effectedPlayer);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
@ -1455,7 +1455,7 @@ public class EntityEventHandler implements Listener
if (defenderClaim != null && GriefPrevention.instance.claimIsPvPSafeZone(defenderClaim)) if (defenderClaim != null && GriefPrevention.instance.claimIsPvPSafeZone(defenderClaim))
{ {
defenderData.lastClaim = defenderClaim; defenderData.lastClaim = defenderClaim;
PreventPvPEvent pvpEvent = new PreventPvPEvent(defenderClaim); PreventPvPEvent pvpEvent = new PreventPvPEvent(defenderClaim, thrower, effectedPlayer);
Bukkit.getPluginManager().callEvent(pvpEvent); Bukkit.getPluginManager().callEvent(pvpEvent);
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {

22
src/main/java/me/ryanhamshire/GriefPrevention/events/PreventPvPEvent.java
View File

@ -1,6 +1,8 @@
package me.ryanhamshire.GriefPrevention.events; package me.ryanhamshire.GriefPrevention.events;
import me.ryanhamshire.GriefPrevention.Claim; import me.ryanhamshire.GriefPrevention.Claim;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
@ -17,10 +19,14 @@ public class PreventPvPEvent extends Event implements Cancellable
} }
Claim claim; Claim claim;
Player attacker;
Entity defender;
public PreventPvPEvent(Claim claim) public PreventPvPEvent(Claim claim, Player attacker, Entity defender)
{ {
this.claim = claim; this.claim = claim;
this.attacker = attacker;
this.defender = defender;
} }
public Claim getClaim() public Claim getClaim()
@ -28,6 +34,20 @@ public class PreventPvPEvent extends Event implements Cancellable
return this.claim; return this.claim;
} }
public Player getAttacker()
{
return attacker;
}
/**
* @return The defender -- almost in all cases a player, unless the attacker damages a Tamable (pet),
* in which case the pet is returned.
*/
public Entity getDefender()
{
return defender;
}
@Override @Override
public HandlerList getHandlers() public HandlerList getHandlers()
{ {