Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10c7fdc828 | ||
|
|
89d52ff384 | ||
|
|
70da7cf156 |
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"
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+4
@@ -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;
|
||||
}
|
||||
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user