added check for creeper

Author: BuildTools

build.gradle

@@ -0,0 +1,49 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    java
+    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("io.papermc.paperweight.userdev") version "1.3.9-SNAPSHOT"
+}
+
+group = "com.azortis"
+version = "1.0.0"
+
+repositories {
+    mavenCentral()
+    maven {
+        url = uri("https://papermc.io/repo/repository/maven-public/")
+    }
+    maven {
+        url = uri("https://oss.sonatype.org/content/groups/public/")
+    }
+    maven {
+        url = uri("https://maven.enginehub.org/repo/")
+    }
+}
+
+dependencies {
+    paperDevBundle("1.19-R0.1-SNAPSHOT")
+    compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.7")
+    compileOnly("net.kyori:adventure-api:4.11.0")
+    implementation("cloud.commandframework:cloud-core:1.7.0")
+    implementation("cloud.commandframework:cloud-paper:1.7.0")
+    implementation("cloud.commandframework:cloud-annotations:1.7.0")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+}
+
+tasks {
+    named<ShadowJar>("shadowJar") {
+        mergeServiceFiles()
+    }
+}
+
+tasks {
+    build {
+        dependsOn(shadowJar)
+        dependsOn(reobfJar)
+    }
+}

build.gradle.kts

@@ -0,0 +1,8 @@
+rootProject.name = "CombatLog"
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://papermc.io/repo/repository/maven-public/")
+    }
+}

settings.gradle

@@ -1,23 +1,25 @@
 package com.azortis.combatlog.listener;
 
 import com.azortis.combatlog.managers.CombatManager;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.*;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.*;
 
 public class CombatListener implements Listener {
     private final CombatManager manager;
-
+    private Map<UUID, Set<Creeper>> creeperSpawner = new HashMap<>();
     public CombatListener(CombatManager manager) {
         this.manager = manager;
     }
@@ -27,8 +29,6 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         if (event.getEntityType() != EntityType.PLAYER) return;
         Player player = (Player) event.getEntity();
         Player damager = null;
-
-
         switch (event.getCause()) {
             case MAGIC:
             case PROJECTILE:
@@ -43,7 +43,10 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
                 damager = (Player) event.getDamager();
                 break;
             case ENTITY_EXPLOSION:
-                // todo: track who spawns creepers
+                if (event.getDamager().getType() != EntityType.CREEPER) return;
+                for(Player spawner : Bukkit.getOnlinePlayers()) {
+                    if(creeperSpawner.get(spawner.getUniqueId()).contains(event.getDamager())) damager = spawner;
+                }
                 break;
             default:
                 break;
@@ -56,30 +59,47 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityDamageEvent(EntityDamageEvent event) {
-
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityBlockDamageEvent(EntityDamageByBlockEvent event) {
-
+        if(event.getEntity().getType() != EntityType.PLAYER) return;
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
+
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerJoin(PlayerJoinEvent event) {
+
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerLeave(PlayerQuitEvent event) {
+        creeperSpawner.remove(event.getPlayer().getUniqueId());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
 
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if(event.getItem().getType() == Material.CREEPER_SPAWN_EGG) return;
+        if(event.getClickedBlock().getType() == Material.AIR) return;
+        Creeper creeper = (Creeper) event.getPlayer().getWorld().spawnEntity(event.getClickedBlock().getLocation().add(0, 1, 0), EntityType.CREEPER, CreatureSpawnEvent.SpawnReason.EGG);
+        Player player = event.getPlayer();
+        if (!creeperSpawner.containsKey(player.getUniqueId())) creeperSpawner.put(player.getUniqueId(), new HashSet<>());
+        creeperSpawner.get(player.getUniqueId()).add(creeper);
+    }
 
-}
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntitySpawn(CreatureSpawnEvent event) {
+        if(event.getSpawnReason() != CreatureSpawnEvent.SpawnReason.EGG) return;
+        if(event.getEntity().getType() != EntityType.CREEPER) return;
+        if(!(creeperSpawner.containsKey(event.getLocation()))) return;
+    }
+}

settings.gradle.kts

@@ -5,9 +5,15 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 public class CombatManager {
     private final CombatLog plugin;
 
+    public Map<UUID, Integer> combatTimer = new HashMap<>();
+
     public CombatManager(CombatLog plugin) {
         this.plugin = plugin;
 
@@ -19,5 +25,7 @@ public CombatManager(CombatLog plugin) {
 
     public void processAttack(Player damaged, Player damager) {
         // todo: do this
+        combatTimer.put(damaged.getUniqueId(), 30);
+        combatTimer.put(damager.getUniqueId(), 30);
     }
 }