indirect kill logic update 1

Author: EvModder

configs/config.yml

@@ -148,6 +148,9 @@ head-place-overwrite-blocks: ['AIR', 'WATER', 'SHORT_GRASS']
 # Possible values: [LOWEST, LOW, NORMAL, HIGH, HIGHEST, MONITOR]
 death-listener-priority: LOW
 
+# In vanilla, the main-hand item is used for looting even if shot from offhand
+use-ranged-weapon-for-looting: true
+
 # Attempt to replace headA with headB whenever possible (server-wide)
 # The head on the left is replaced with the one on the right when updated
 replace-heads:

configs/entity-settings.yml

@@ -13,20 +13,14 @@ drop-for-nonplayer-kills:
   default: false
   creaking: true
 
-# Whether to drop heads if last-damage-cause is not a valid entity
-# Instead, any entity damaged by a player within the time threshold is able
-# to drop its head. Set threshold <= 0 to allow head drops for any death
-drop-for-indirect-kills:
-  default: false
-  creaking: true
+# Only applies for entities that must be killed by a player
+# Any entity damaged by a player within the threshold can drop a head
+drop-for-indirect-player-kills: false
 indirect-kill-threshold: '30s'
 
 # Whether to drop heads if killed by a projectile weapon
 drop-for-ranged-kills: false
 
-# In vanilla, the main-hand item is used for looting even if shot from offhand
-use-ranged-weapon-for-looting: true
-
 # Drop chances are multiplied by this number for each level of looting
 looting-multiplier: 1.1
 

plugin.yml

@@ -5,7 +5,7 @@ description: Heads for every mob and player.
 website: https://dev.bukkit.org/projects/dropheads
 #3=major rewrite
 #10=Java8->Java21, entity-settings grouping, config file reorg
-#1=fix translation loading, fix creaking head not dropping, fix entity settings not applying
+#1=fix translation loading, fix creaking head not dropping, fix entity settings not applying, creaking head drops enabled by default
 version: 3.10.1
 api-version: 1.13
 softdepend: [HeadDatabase, Essentials, VanishNoPacket]

src/net/evmodder/DropHeads/DropHeads.java

@@ -23,6 +23,7 @@
 import java.io.InputStreamReader;
 import org.bukkit.configuration.file.YamlConfiguration;
 import net.evmodder.DropHeads.commands.*;
+import net.evmodder.DropHeads.datatypes.EntitySetting;
 import net.evmodder.DropHeads.datatypes.NoteblockMode;
 import net.evmodder.DropHeads.listeners.*;
 import net.evmodder.EvLib.EvPlugin;
@@ -62,6 +63,7 @@ public final class DropHeads extends EvPlugin{
 	private static DropHeads instance; public static DropHeads getPlugin(){return instance;}
 	private InternalAPI api; public HeadAPI getAPI(){return api;} public InternalAPI getInternalAPI(){return api;}
 	private DropChanceAPI dropChanceAPI; public DropChanceAPI getDropChanceAPI(){return dropChanceAPI;}
+	private EntityDeathListener entityDeathListener; public EntityDeathListener getEntityDeathListener(){return entityDeathListener;}
 	private DeathMessagePacketIntercepter deathMessageBlocker;
 	private boolean LOGFILE_ENABLED;
 	private String LOGFILE_NAME;
@@ -121,15 +123,19 @@ public final class DropHeads extends EvPlugin{
 			deathMessageBlocker = new DeathMessagePacketIntercepter(REPLACE_PLAYER_DEATH_MSG, REPLACE_PET_DEATH_MSG);
 		}
 		dropChanceAPI = new DropChanceAPI(REPLACE_PLAYER_DEATH_MSG, REPLACE_PET_DEATH_MSG, deathMessageBlocker);
-		new EntityDeathListener(deathMessageBlocker);
+
+		EntitySetting<Boolean> allowNonPlayerKills = EntitySetting.fromConfig(this, "drop-for-nonplayer-kills", false, null);
+		EntitySetting<Boolean> allowIndirectPlayerKills = EntitySetting.fromConfig(this, "drop-for-indirect-player-kills", false, null);
+		EntitySetting<Boolean> allowProjectileKills = EntitySetting.fromConfig(this, "drop-for-ranged-kills", false, null);
+		new EntityDeathListener(deathMessageBlocker, allowNonPlayerKills, allowIndirectKills, allowProjectileKills);
 
 		if(config.getBoolean("track-mob-spawns", true)){
 			getServer().getPluginManager().registerEvents(new EntitySpawnListener(), this);
 		}
-		if(config.getBoolean("drop-for-ranged-kills", false) && config.getBoolean("use-ranged-weapon-for-looting", true)){
+		if(allowProjectileKills.hasAnyValue() && config.getBoolean("use-ranged-weapon-for-looting", true)){
 			getServer().getPluginManager().registerEvents(new ProjectileFireListener(), this);
 		}
-		if(config.getBoolean("drop-for-indirect-kills", false) && !config.getBoolean("drop-for-nonplayer-kills", false)){
+		if(allowIndirectPlayerKills.hasAnyValue()){
 			getServer().getPluginManager().registerEvents(new EntityDamageListener(), this);
 		}
 		if(config.getBoolean("refresh-textures", false)){

src/net/evmodder/DropHeads/listeners/EntityDamageListener.java

@@ -8,20 +8,23 @@
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 import net.evmodder.DropHeads.DropHeads;
+import net.evmodder.DropHeads.datatypes.EntitySetting;
 
+//Only enabled if drop-for-indirect-kills:TRUE && drop-for-nonplayer-kills:FALSE
 public class EntityDamageListener implements Listener{
 	private final DropHeads pl;
-	private final boolean ALLOW_PROJECTILE_KILLS;
+	private final EntitySetting<Boolean> allowProjectileKills;
 
-	// Only enabled if drop-for-indirect-kills:TRUE && drop-for-nonplayer-kills:FALSE
-	public EntityDamageListener(){
+	public EntityDamageListener(EntitySetting<Boolean> allowProjectileKills){
 		pl = DropHeads.getPlugin();
-		ALLOW_PROJECTILE_KILLS = pl.getConfig().getBoolean("drop-for-ranged-kills", false);
+		this.allowProjectileKills = allowProjectileKills;
 	}
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void entityDamageEvent(EntityDamageByEntityEvent evt){
-		if(evt.getDamager() instanceof Player || (ALLOW_PROJECTILE_KILLS && evt.getDamager() instanceof Projectile
-				&& ((Projectile)evt.getDamager()).getShooter() instanceof Player)){
+		if(evt.getDamager() instanceof Player ||
+				(allowProjectileKills.get(evt.getEntity()) && evt.getDamager() instanceof Projectile proj && proj.getShooter() instanceof Player)
+		){
+			pl.getLogger().warning("entity dmged by player: "+evt.getEntityType());
 			evt.getEntity().setMetadata("PlayerDamage", new FixedMetadataValue(pl, System.currentTimeMillis()));
 		}
 	}

src/net/evmodder/DropHeads/listeners/EntityDeathListener.java

@@ -5,6 +5,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.UUID;
 import javax.annotation.Nonnull;
@@ -33,6 +34,7 @@
 import net.evmodder.DropHeads.DropHeads;
 import net.evmodder.DropHeads.JunkUtils;
 import net.evmodder.DropHeads.TextureKeyLookup;
+import net.evmodder.DropHeads.commands.CommandDropRate;
 import net.evmodder.DropHeads.datatypes.EntitySetting;
 import net.evmodder.DropHeads.events.HeadRollEvent;
 import net.evmodder.EvLib.EvUtils;
@@ -45,23 +47,24 @@ public class EntityDeathListener implements Listener{
 	private final Random rand;
 	private final HashSet<UUID> explodingChargedCreepers;
 	private final EventPriority PRIORITY;
-	private final boolean USE_RANGED_WEAPON_FOR_LOOTING;
-	private final EntitySetting<Boolean> allowNonPlayerKills, allowIndirectKills, allowProjectileKills;//, useRangedWeaponForLooting;
+	private final EntitySetting<Boolean> allowNonPlayerKills, allowIndirectPlayerKills, allowProjectileKills;//, useRangedWeaponForLooting;
 	//TODO: pkillonly config per-mob?
+	private final boolean USE_RANGED_WEAPON_FOR_LOOTING;
 	private final boolean CHARGED_CREEPER_DROPS, VANILLA_WSKELE_HANDLING;
 	private final long INDIRECT_KILL_THRESHOLD_MILLIS;
 	private final boolean DEBUG_MODE;
 
 	public static final class Friend{private Friend(){}}
 
-	public EntityDeathListener(DeathMessagePacketIntercepter deathMessageBlocker){
-		pl = DropHeads.getPlugin();
+	public EntityDeathListener(DeathMessagePacketIntercepter deathMessageBlocker,
+			EntitySetting<Boolean> allowNonPlayerKills, EntitySetting<Boolean> allowIndirectPlayerKills, EntitySetting<Boolean> allowProjectileKills){
 		this.deathMessageBlocker = deathMessageBlocker;
+		this.allowNonPlayerKills = allowNonPlayerKills;
+		this.allowIndirectPlayerKills = allowIndirectPlayerKills;
+		this.allowProjectileKills = allowProjectileKills;
+		pl = DropHeads.getPlugin();
 		rand = new Random();
 		USE_RANGED_WEAPON_FOR_LOOTING = pl.getConfig().getBoolean("use-ranged-weapon-for-looting", true);
-		allowNonPlayerKills = EntitySetting.fromConfig(pl, "drop-for-nonplayer-kills", false, null);
-		allowIndirectKills = EntitySetting.fromConfig(pl, "drop-for-indirect-kills", false, null);
-		allowProjectileKills = EntitySetting.fromConfig(pl, "drop-for-ranged-kills", false, null);
 
 		CHARGED_CREEPER_DROPS = pl.getConfig().getBoolean("charged-creeper-drops", true);
 		VANILLA_WSKELE_HANDLING = pl.getConfig().getBoolean("vanilla-wither-skeleton-skulls", false);
@@ -157,6 +160,17 @@ boolean onEntityDeath(@Nonnull final Entity victim, final Entity killer, final E
 			}
 		}
 		// Check if killer qualifies to trigger a behead.
+//		if(killer != null){
+//			if(!allowProjectileKills.get(victim) && killer instanceof Projectile) return false;
+//			if(!allowNonPlayerKills.get(victim) && killer instanceof Player == false &&
+//					!(allowProjectileKills.get(victim) && killer instanceof Projectile proj && proj.getShooter() instanceof Player)
+//			) return false;
+//		}
+//		else if(!allowNonPlayerKills.get(victim) &&
+//			(!allowIndirectPlayerKills.get(victim) || JunkUtils.timeSinceLastPlayerDamage(victim) > INDIRECT_KILL_THRESHOLD_MILLIS)
+//		) return false;
+//			
+//		}
 		if(killer == null
 			? (!allowIndirectKills.get(victim) ||
 				(INDIRECT_KILL_THRESHOLD_MILLIS >= 0 && JunkUtils.timeSinceLastPlayerDamage(victim) > INDIRECT_KILL_THRESHOLD_MILLIS))
@@ -166,14 +180,6 @@ boolean onEntityDeath(@Nonnull final Entity victim, final Entity killer, final E
 				!(allowProjectileKills.get(victim) && killer instanceof Projectile proj && proj.getShooter() instanceof Player)
 			)
 		) return false;
-//		if(
-//			// Note: Won't use timeSinceLastEntityDamage()... it would be expensive to keep track of
-//			(killer == null && (!allowIndirectKills.get(victim) || JunkUtils.timeSinceLastPlayerDamage(victim) > INDIRECT_KILL_THRESHOLD_MILLIS)) ||
-//			(killer != null && !allowProjectileKills.get(victim) && killer instanceof Projectile) ||
-//			(killer != null && !allowNonPlayerKills.get(victim) &&
-//				!(allowProjectileKills.get(victim) && killer instanceof Projectile proj && proj.getShooter() instanceof Player)
-//			)
-//		) return false;
 
 		final ItemStack murderWeapon = getWeaponFromKiller(killer);
 		final Material murderWeaponType = murderWeapon == null ? Material.AIR : murderWeapon.getType();