Compare commits

...
Author SHA1 Message Date
Martin Sulikowski 10c7fdc828 Fix checkstyle violations.
Signed-off-by: Martin Sulikowski <vLuckyyy.biznes@gmail.com>
2024-01-09 17:56:13 +01:00
Martin Sulikowski 89d52ff384 Release v1.2.0
Signed-off-by: Martin Sulikowski <vLuckyyy.biznes@gmail.com>
2024-01-09 17:54:33 +01:00
Crispi 70da7cf156 Fix fight tag for admin. 2023-12-25 23:43:49 +01:00
5 changed files with 8 additions and 4 deletions

No files matched your search

@@ -4,7 +4,7 @@ plugins {
}
group = "com.eternalcode"
version = "1.1.1"
version = "1.2.0"
checkstyle {
toolVersion = "10.12.5"
@@ -34,7 +34,7 @@ public class PlayersHealthDropModifier implements DropModifier {
@Override
public DropResult modifyDrop(Drop drop) {
Optional<Logout> logoutOptional = logoutService.nextLogoutFor(drop.getPlayer().getUniqueId());
Optional<Logout> logoutOptional = this.logoutService.nextLogoutFor(drop.getPlayer().getUniqueId());
if (logoutOptional.isEmpty()) {
return null;
@@ -54,6 +54,10 @@ public class FightTagController implements Listener {
UUID attackedUniqueId = attackedPlayerByPerson.getUniqueId();
UUID attackerUniqueId = attacker.getUniqueId();
if (attacker.isOp()) {
return;
}
if (attackedPlayerByPerson.isOp() && this.config.settings.excludeAdminFromCombat) {
return;
}
@@ -40,7 +40,7 @@ public class FightUnTagController implements Listener {
}
private CauseOfUnTag getDeathCause(Player player, Player killer) {
if (logoutService.hasLoggedOut(player.getUniqueId())) {
if (this.logoutService.hasLoggedOut(player.getUniqueId())) {
return CauseOfUnTag.LOGOUT;
}
@@ -33,7 +33,7 @@ public class LogoutController implements Listener {
return;
}
logoutService.punishForLogout(player);
this.logoutService.punishForLogout(player);
player.setHealth(0.0);
Formatter formatter = new Formatter()