Skip to content

Commit bf34364

Browse files
committed
Add more details to combat log file
1 parent 6f0b457 commit bf34364

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

pvpmanager/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@
6464
<url>https://repo.codemc.org/repository/maven-public</url>
6565
</repository>
6666

67+
<!-- Towny -->
68+
<repository>
69+
<id>glaremasters repo</id>
70+
<url>https://repo.glaremasters.me/repository/towny/</url>
71+
</repository>
72+
6773
</repositories>
6874

6975
<build>
@@ -204,9 +210,9 @@
204210

205211
<!-- Towny -->
206212
<dependency>
207-
<groupId>com.github.TownyAdvanced</groupId>
213+
<groupId>com.palmergames.bukkit.towny</groupId>
208214
<artifactId>towny</artifactId>
209-
<version>0.101.0.3</version>
215+
<version>0.101.0.0</version>
210216
<scope>provided</scope>
211217
</dependency>
212218

pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/PlayerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public final void onPlayerLogout(final PlayerQuitEvent event) {
120120
Log.debug(player.getName() + " quit with reason: " + event.getQuitMessage() + " - In combat: " + pvPlayer.isInCombat());
121121
if (pvPlayer.isInCombat() && !pvPlayer.hasPerm(Permissions.EXEMPT_COMBAT_LOG)) {
122122
if (Settings.isLogToFile()) {
123-
ph.getConfigManager().getLog().log(player.getName() + " tried to escape combat!");
123+
ph.getConfigManager().getLog().logCombatLog(pvPlayer);
124124
}
125125
CombatUtils.executeCommands(Settings.getCommandsOnPvPLog(), player, player.getName());
126126
ph.applyPunishments(pvPlayer);

pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/LogFile.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
import java.io.IOException;
77
import java.text.SimpleDateFormat;
88
import java.util.Date;
9+
import java.util.stream.Collectors;
910

11+
import org.bukkit.Location;
1012
import org.bukkit.scheduler.BukkitRunnable;
1113

14+
import me.NoChance.PvPManager.PvPlayer;
1215
import me.chancesd.pvpmanager.utils.ScheduleUtils;
1316

1417
public class LogFile {
@@ -46,4 +49,12 @@ public final void log(final String line) {
4649
write(format.format(new Date()) + line);
4750
}
4851

52+
public final void logCombatLog(final PvPlayer player) {
53+
final Location loc = player.getPlayer().getLocation();
54+
final String data = player.getName() + " tried to escape combat! (" + player.getTagTimeLeft() / 1000 + "s left)"
55+
+ " | In combat with: " + player.getEnemies().stream().map(PvPlayer::getName).collect(Collectors.toList())
56+
+ String.format(" | World:%s, X:%.2f, Y:%.2f, Z:%.2f", loc.getWorld().getName(), loc.getX(), loc.getY(), loc.getZ());
57+
write(format.format(new Date()) + data);
58+
}
59+
4960
}

0 commit comments

Comments
 (0)