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

Fix some issues with splash potions (#1636)

Browse Source 
- Fix NPE on non-player thrower
- Fix non-player thrower warning console when blocked
- Fix only first entity being saved
- Allow dispensers inside the same claim to harm entities with potions (consistent with arrows)
- Fix spamming player on multi-hit/multi-effect
This commit is contained in:
Adam 2021-10-25 12:38:33 -04:00 committed by GitHub
parent ed92324c26
commit a844e39865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,14 +309,19 @@ public class EntityEventHandler implements Listener
} }
// Allow change if projectile was shot by a dispenser in the same claim. // Allow change if projectile was shot by a dispenser in the same claim.
if (shooter instanceof BlockProjectileSource && if (isBlockSourceInClaim(shooter, claim))
GriefPrevention.instance.dataStore.getClaimAt(((BlockProjectileSource) shooter).getBlock().getLocation(), false, claim) == claim)
return; return;
// Prevent change in all other cases. // Prevent change in all other cases.
event.setCancelled(true); event.setCancelled(true);
} }
private boolean isBlockSourceInClaim(ProjectileSource projectileSource, Claim claim)
{
return projectileSource instanceof BlockProjectileSource &&
GriefPrevention.instance.dataStore.getClaimAt(((BlockProjectileSource) projectileSource).getBlock().getLocation(), false, claim) == claim;
}
//Used by "sand cannon" fix to ignore fallingblocks that fell through End Portals //Used by "sand cannon" fix to ignore fallingblocks that fell through End Portals
//This is largely due to a CB issue with the above event //This is largely due to a CB issue with the above event
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@ -1461,37 +1466,62 @@ public class EntityEventHandler implements Listener
{ {
ThrownPotion potion = event.getPotion(); ThrownPotion potion = event.getPotion();
//ignore potions not thrown by players
ProjectileSource projectileSource = potion.getShooter(); ProjectileSource projectileSource = potion.getShooter();
// Ignore potions with no source.
if (projectileSource == null) return; if (projectileSource == null) return;
Player thrower = null; Player thrower = null;
if ((projectileSource instanceof Player)) if ((projectileSource instanceof Player))
thrower = (Player) projectileSource; thrower = (Player) projectileSource;
boolean messagedPlayer = false;
Collection<PotionEffect> effects = potion.getEffects(); Collection<PotionEffect> effects = potion.getEffects();
for (PotionEffect effect : effects) for (PotionEffect effect : effects)
{ {
PotionEffectType effectType = effect.getType(); PotionEffectType effectType = effect.getType();
//restrict some potions on claimed animals (griefers could use this to kill or steal animals over fences) //RoboMWM: include villagers // Restrict some potions on claimed villagers and animals.
if (effectType.getName().equals("JUMP") || effectType.getName().equals("POISON")) // Griefers could use potions to kill entities or steal them over fences.
if (PotionEffectType.HARM.equals(effectType)
|| PotionEffectType.POISON.equals(effectType)
|| PotionEffectType.JUMP.equals(effectType)
|| PotionEffectType.WITHER.equals(effectType))
{ {
Claim cachedClaim = null; Claim cachedClaim = null;
for (LivingEntity effected : event.getAffectedEntities()) for (LivingEntity affected : event.getAffectedEntities())
{ {
if (effected.getType() == EntityType.VILLAGER || effected instanceof Animals) // Always impact the thrower.
if (affected == thrower) continue;
if (affected.getType() == EntityType.VILLAGER || affected instanceof Animals)
{ {
Claim claim = this.dataStore.getClaimAt(effected.getLocation(), false, cachedClaim); Claim claim = this.dataStore.getClaimAt(affected.getLocation(), false, cachedClaim);
if (claim != null) if (claim != null)
{ {
cachedClaim = claim; cachedClaim = claim;
Supplier<String> override = () -> instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName());
final Supplier<String> noContainersReason = claim.checkPermission(thrower, ClaimPermission.Inventory, event, override); if (thrower == null)
if (thrower == null || noContainersReason != null)
{ {
event.setIntensity(effected, 0); // Non-player source: Witches, dispensers, etc.
GriefPrevention.sendMessage(thrower, TextMode.Err, noContainersReason.get()); if (!isBlockSourceInClaim(projectileSource, claim))
return; {
// If the source is not a block in the same claim as the affected entity, disallow.
event.setIntensity(affected, 0);
}
}
else
{
// Source is a player. Determine if they have permission to access entities in the claim.
Supplier<String> override = () -> instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName());
final Supplier<String> noContainersReason = claim.checkPermission(thrower, ClaimPermission.Inventory, event, override);
if (noContainersReason != null)
{
event.setIntensity(affected, 0);
if (!messagedPlayer)
{
GriefPrevention.sendMessage(thrower, TextMode.Err, noContainersReason.get());
messagedPlayer = true;
}
}
} }
} }
} }
@ -1528,7 +1558,11 @@ public class EntityEventHandler implements Listener
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
event.setIntensity(effected, 0); event.setIntensity(effected, 0);
GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.CantFightWhileImmune); if (!messagedPlayer)
{
GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.CantFightWhileImmune);
messagedPlayer = true;
}
} }
continue; continue;
} }
@ -1542,7 +1576,11 @@ public class EntityEventHandler implements Listener
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
event.setIntensity(effected, 0); event.setIntensity(effected, 0);
GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.PlayerInPvPSafeZone); if (!messagedPlayer)
{
GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.PlayerInPvPSafeZone);
messagedPlayer = true;
}
} }
} }
} }