GalaxyNetwork/GalaxyBoxPvP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messages when AFK, fix gitignore

Browse Source
This commit is contained in:
Travis
2024-07-12 18:06:16 -07:00
parent 753bab0d13
commit 8f17de9c67
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.gitignore vendored
View File

@@ -7,11 +7,6 @@
# IntelliJ # IntelliJ
out/ out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Compiled class file # Compiled class file
*.class *.class
@@ -100,19 +95,19 @@ $RECYCLE.BIN/
# Windows shortcuts # Windows shortcuts
*.lnk *.lnk
.gradle target/
build/
# Ignore Gradle GUI config pom.xml.tag
gradle-app.setting pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
# Cache of project release.properties
.gradletasknamecache dependency-reduced-pom.xml
buildNumber.properties
**/build/ .mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
.flattened-pom.xml
# Common working directory # Common working directory
run/ run/
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

9
src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java
View File

@@ -4,8 +4,11 @@ import io.github.lncvrt.lncvrtbox.LncvrtBox;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import static org.bukkit.ChatColor.*;
public class EntityDamageListener implements Listener { public class EntityDamageListener implements Listener {
private final LncvrtBox plugin; private final LncvrtBox plugin;
@@ -18,6 +21,12 @@ public class EntityDamageListener implements Listener {
if (event.getEntity() instanceof Player player) { if (event.getEntity() instanceof Player player) {
if (plugin.isAfk(player)) { if (plugin.isAfk(player)) {
event.setCancelled(true); 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()));
}
}
} }
} }
} }

2
src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java
View File

@@ -20,7 +20,7 @@ public class EntityResurrectListener implements Listener {
public void onEntityResurrect(EntityResurrectEvent event) { public void onEntityResurrect(EntityResurrectEvent event) {
if (event.getEntity() instanceof Player player && !event.isCancelled()) { 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) { 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()));
} }
} }
} }

2
src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java
View File

@@ -12,6 +12,6 @@ public class PlayerDeathListener implements Listener {
String suicideMsg = ""; String suicideMsg = "";
if (event.getEntity() == event.getEntity().getKiller()) suicideMsg = "%s (suicide)".formatted(RESET); 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));
} }
} }