diff --git a/.gitignore b/.gitignore index 3c37caf..87d4436 100644 --- a/.gitignore +++ b/.gitignore @@ -7,11 +7,6 @@ # IntelliJ out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml # Compiled class file *.class @@ -100,19 +95,19 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -.gradle -build/ +target/ -# Ignore Gradle GUI config -gradle-app.setting +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next -# Cache of project -.gradletasknamecache - -**/build/ +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml # Common working directory -run/ - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar +run/ \ No newline at end of file diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java index ff2f56e..58d81ec 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java @@ -4,8 +4,11 @@ import io.github.lncvrt.lncvrtbox.LncvrtBox; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; +import static org.bukkit.ChatColor.*; + public class EntityDamageListener implements Listener { private final LncvrtBox plugin; @@ -18,6 +21,12 @@ public class EntityDamageListener implements Listener { if (event.getEntity() instanceof Player player) { if (plugin.isAfk(player)) { event.setCancelled(true); + if (event instanceof EntityDamageByEntityEvent damageEvent) { + if (damageEvent.getDamager() instanceof Player attacker) { + attacker.sendMessage("%s%sLncvrtBox %s%s» %sYou can't attack AFK players!".formatted(GOLD, BOLD, GRAY, BOLD, RESET)); + player.sendMessage("%s%sLncvrtBox %s%s» %s%s tried to attack you while you were AFK!".formatted(GOLD, BOLD, GRAY, BOLD, RESET, attacker.getName())); + } + } } } } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java index 0df0295..62c1f74 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java @@ -20,7 +20,7 @@ public class EntityResurrectListener implements Listener { public void onEntityResurrect(EntityResurrectEvent event) { if (event.getEntity() instanceof Player player && !event.isCancelled()) { if (player.getInventory().getItemInMainHand().getType() == Material.TOTEM_OF_UNDYING || player.getInventory().getItemInOffHand().getType() == Material.TOTEM_OF_UNDYING) { - plugin.getServer().broadcastMessage("%s%sLncvrtBox %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, WHITE, player.getName())); + plugin.getServer().broadcastMessage("%s%sLncvrtBox %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, RESET, player.getName())); } } } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java index 9b6ed78..7656c49 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java @@ -12,6 +12,6 @@ public class PlayerDeathListener implements Listener { String suicideMsg = ""; if (event.getEntity() == event.getEntity().getKiller()) suicideMsg = "%s (suicide)".formatted(RESET); - event.setDeathMessage("%s%sLncvrtBox %s%s» %s%s%s".formatted(GOLD, BOLD, GRAY, BOLD, WHITE, event.getDeathMessage(), suicideMsg)); + event.setDeathMessage("%s%sLncvrtBox %s%s» %s%s%s".formatted(GOLD, BOLD, GRAY, BOLD, RESET, event.getDeathMessage(), suicideMsg)); } }