JUFS/Tplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nearest raider option

Browse Source
This commit is contained in:
ThisTestUser
2022-12-23 12:16:32 -05:00
parent 2f38e556ae
commit 910b53f54f
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/EnumTargetGoal.java
View File

@@ -7,6 +7,7 @@ public enum EnumTargetGoal {
NEAREST_VULNERABLE_PLAYER("Locate the nearest real player that is in either Survival or Adventure mode."), NEAREST_VULNERABLE_PLAYER("Locate the nearest real player that is in either Survival or Adventure mode."),
NEAREST_PLAYER("Locate the nearest real online player, despite the gamemode."), NEAREST_PLAYER("Locate the nearest real online player, despite the gamemode."),
NEAREST_HOSTILE("Locate the nearest hostile entity."), NEAREST_HOSTILE("Locate the nearest hostile entity."),
NEAREST_RAIDER("Locate the nearest raider."),
NEAREST_MOB("Locate the nearest mob."), NEAREST_MOB("Locate the nearest mob."),
NEAREST_BOT("Locate the nearest bot."), NEAREST_BOT("Locate the nearest bot."),
NEAREST_BOT_DIFFER("Locate the nearest bot with a different username."), NEAREST_BOT_DIFFER("Locate the nearest bot with a different username."),
@@ -20,6 +21,7 @@ public enum EnumTargetGoal {
this.put("nearestvulnerableplayer", NEAREST_VULNERABLE_PLAYER); this.put("nearestvulnerableplayer", NEAREST_VULNERABLE_PLAYER);
this.put("nearestplayer", NEAREST_PLAYER); this.put("nearestplayer", NEAREST_PLAYER);
this.put("nearesthostile", NEAREST_HOSTILE); this.put("nearesthostile", NEAREST_HOSTILE);
this.put("nearestraider", NEAREST_RAIDER);
this.put("nearestmob", NEAREST_MOB); this.put("nearestmob", NEAREST_MOB);
this.put("nearestbot", NEAREST_BOT); this.put("nearestbot", NEAREST_BOT);
this.put("nearestbotdiffer", NEAREST_BOT_DIFFER); this.put("nearestbotdiffer", NEAREST_BOT_DIFFER);

10
TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java
View File

@@ -1463,6 +1463,16 @@ public class LegacyAgent extends Agent {
break; break;
} }
case NEAREST_RAIDER: {
for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) {
if ((entity instanceof Raider || (entity instanceof Vex vex && vex.getSummoner() instanceof Raider)) && validateCloserEntity(entity, loc, result)) {
result = entity;
}
}
break;
}
case NEAREST_MOB: { case NEAREST_MOB: {
for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) { for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) {