From 56e480f763a6d5b2af4da357e5c8e845e48f4e21 Mon Sep 17 00:00:00 2001
From: carm <carm@carmwork.com>
Date: Fri, 29 May 2020 11:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E7=94=9F=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 2b2t-death/pom.xml                                           | 5 +++++
 .../org/cn2b2t/functions/death/listeners/DeathListener.java  | 5 +++++
 .../cn2b2t/functions/death/listeners/RespawnListener.java    | 3 ++-
 2b2t-death/src/main/resources/plugin.yml                     | 1 +
 .../main/java/org/cn2b2t/logger/listener/LoggerListener.java | 3 +++
 .../main/java/org/cn2b2t/logger/managers/LoggerManager.java  | 3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/2b2t-death/pom.xml b/2b2t-death/pom.xml
index d6eb5ff..321c11f 100644
--- a/2b2t-death/pom.xml
+++ b/2b2t-death/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>2b2t-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.cn2b2t</groupId>
+            <artifactId>2b2t-logger</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/DeathListener.java b/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/DeathListener.java
index b20e384..2384db3 100644
--- a/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/DeathListener.java
+++ b/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/DeathListener.java
@@ -7,6 +7,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
+import org.cn2b2t.logger.managers.LoggerManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,8 +26,12 @@ public class DeathListener implements Listener {
             meta.setLore(lore);
             skull.setItemMeta(meta);
             e.getDrops().add(skull);
+            LoggerManager.log(LoggerManager.LogType.KILLED, e.getEntity(), e.getDeathMessage());
+        } else {
+            LoggerManager.log(LoggerManager.LogType.DEATH, e.getEntity(), e.getDeathMessage());
         }
 
+
     }
 
 
diff --git a/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/RespawnListener.java b/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/RespawnListener.java
index 2013743..dbb0c6b 100644
--- a/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/RespawnListener.java
+++ b/2b2t-death/src/main/java/org/cn2b2t/functions/death/listeners/RespawnListener.java
@@ -8,6 +8,7 @@ import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.cn2b2t.functions.death.managers.users.UserBedManager;
 import org.cn2b2t.functions.death.managers.utils.DeathManager;
+import org.cn2b2t.logger.managers.LoggerManager;
 
 public class RespawnListener implements Listener {
 
@@ -25,6 +26,7 @@ public class RespawnListener implements Listener {
             p.sendMessage("§7由于您之前的床已被破坏或遮挡，无法将您传送到您的床边。");
             e.setRespawnLocation(DeathManager.randomLocation(Bukkit.getWorld("world")));
         }
+        LoggerManager.log(LoggerManager.LogType.RESPAWN, p, e.getRespawnLocation().toString());
 
     }
 
@@ -38,7 +40,6 @@ public class RespawnListener implements Listener {
                 p.sendMessage("§7由于您之前的床已被破坏或遮挡，无法将您传送到您的床边。");
                 p.teleport(DeathManager.randomLocation(Bukkit.getWorld("world")));
             }
-
         }
     }
 
diff --git a/2b2t-death/src/main/resources/plugin.yml b/2b2t-death/src/main/resources/plugin.yml
index 08349e2..40da010 100644
--- a/2b2t-death/src/main/resources/plugin.yml
+++ b/2b2t-death/src/main/resources/plugin.yml
@@ -7,6 +7,7 @@ authors:
 depend:
   - 2b2t-core
   - 2b2t-common
+  - 2b2t-logger
 commands:
   suicide:
     aliases:
diff --git a/2b2t-logger/src/main/java/org/cn2b2t/logger/listener/LoggerListener.java b/2b2t-logger/src/main/java/org/cn2b2t/logger/listener/LoggerListener.java
index b6b4ca6..3163370 100644
--- a/2b2t-logger/src/main/java/org/cn2b2t/logger/listener/LoggerListener.java
+++ b/2b2t-logger/src/main/java/org/cn2b2t/logger/listener/LoggerListener.java
@@ -3,6 +3,7 @@ package org.cn2b2t.logger.listener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -38,6 +39,8 @@ public class LoggerListener implements Listener {
         LoggerManager.log(LoggerManager.LogType.QUIT, e.getPlayer(), "quit");
     }
 
+
+
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onCMD(final ServerCommandEvent e) {
         LoggerManager.logConsole(LoggerManager.LogType.COMMAND, e.getCommand().replace("\\", "\\\\"));
diff --git a/2b2t-logger/src/main/java/org/cn2b2t/logger/managers/LoggerManager.java b/2b2t-logger/src/main/java/org/cn2b2t/logger/managers/LoggerManager.java
index 8d8542d..a5189fe 100644
--- a/2b2t-logger/src/main/java/org/cn2b2t/logger/managers/LoggerManager.java
+++ b/2b2t-logger/src/main/java/org/cn2b2t/logger/managers/LoggerManager.java
@@ -26,6 +26,9 @@ public class LoggerManager {
         JOIN,
         QUIT,
         AC,
+        DEATH,
+        RESPAWN,
+        KILLED,
         COMMAND
     }