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

Fixed log spam on modded servers.

Browse Source 
Related to entities taking damage where no damage source is available -
sounds sketchy to me, but this workaround should fix the spam.
This commit is contained in:
ryanhamshire 2014-12-02 14:58:04 -08:00
parent 71412a12c2
commit 808b0757bb
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -360,17 +360,21 @@ class EntityEventHandler implements Listener
Player attacker = null; Player attacker = null;
Projectile arrow = null; Projectile arrow = null;
Entity damageSource = subEvent.getDamager(); Entity damageSource = subEvent.getDamager();
if(damageSource instanceof Player)
if(damageSource != null)
{ {
attacker = (Player)damageSource; if(damageSource instanceof Player)
} {
else if(damageSource instanceof Projectile) attacker = (Player)damageSource;
{ }
arrow = (Projectile)damageSource; else if(damageSource instanceof Projectile)
if(arrow.getShooter() instanceof Player) {
{ arrow = (Projectile)damageSource;
attacker = (Player)arrow.getShooter(); if(arrow.getShooter() instanceof Player)
} {
attacker = (Player)arrow.getShooter();
}
}
} }
//if the attacker is a player and defender is a player (pvp combat) //if the attacker is a player and defender is a player (pvp combat)
@ -495,7 +499,7 @@ class EntityEventHandler implements Listener
PlayerData playerData = null; PlayerData playerData = null;
//if not a player or an explosive, allow //if not a player or an explosive, allow
if(attacker == null && damageSource.getType() != EntityType.CREEPER && !(damageSource instanceof Explosive)) if(attacker == null && damageSource != null && damageSource.getType() != EntityType.CREEPER && !(damageSource instanceof Explosive))
{ {
return; return;
} }
@ -516,7 +520,7 @@ class EntityEventHandler implements Listener
if(attacker == null) if(attacker == null)
{ {
//exception case //exception case
if(event.getEntity() instanceof Villager && damageSource instanceof Monster && claim.isAdminClaim()) if(event.getEntity() instanceof Villager && damageSource != null && damageSource instanceof Monster && claim.isAdminClaim())
{ {
return; return;
} }
@ -570,6 +574,20 @@ class EntityEventHandler implements Listener
//determine which player is attacking, if any //determine which player is attacking, if any
Player attacker = null; Player attacker = null;
Entity damageSource = event.getAttacker(); Entity damageSource = event.getAttacker();
//if damage source is null, don't allow the damage when the vehicle is in a land claim
if(damageSource == null)
{
Claim claim = this.dataStore.getClaimAt(event.getVehicle().getLocation(), false, null);
//if it's claimed
if(claim != null)
{
event.setCancelled(true);
return;
}
}
if(damageSource.getType() == EntityType.PLAYER) if(damageSource.getType() == EntityType.PLAYER)
{ {
attacker = (Player)damageSource; attacker = (Player)damageSource;