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

Option to add bots to player list

Browse Source 
-Useful for datapacks that may use commands that target players
-This will count towards the player count
This commit is contained in:
ThisTestUser
2022-11-19 15:58:20 -05:00
parent 9350b6fba3
commit 765c3d6fb4
6 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java
View File

@@ -50,4 +50,7 @@ public interface BotManager {
void setMobTarget(boolean mobTarget);
boolean addToPlayerList();
void setAddToPlayerList(boolean addPlayerList);
}

2
TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java
View File

@@ -125,5 +125,7 @@ public interface Terminator {
void setTargetPlayer(UUID target);
boolean isInPlayerList();
World.Environment getDimension();
}

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

@@ -50,6 +50,7 @@ public class LegacyAgent extends Agent {
private final Map<BukkitRunnable, Byte> mining = new HashMap<>();
private final Set<Terminator> fallDamageCooldown = new HashSet<>();
public boolean offsets = true;
private List<LivingEntity> botEntityCache;
private EnumTargetGoal goal;
private BoundingBox region;
private double regionWeightX;
@@ -69,7 +70,8 @@ public class LegacyAgent extends Agent {
@Override
protected void tick() {
manager.fetch().forEach(this::tickBot);
botEntityCache = manager.fetch().stream().filter(t -> t.isInPlayerList()).map(b -> b.getBukkitEntity()).toList();
manager.fetch().forEach(this::tickBot);
}
private void center(Terminator bot) {
@@ -1426,7 +1428,7 @@ public class LegacyAgent extends Agent {
this.goal = goal;
}
public LivingEntity locateTarget(Terminator bot, Location loc, EnumTargetGoal... targetGoal) {
private LivingEntity locateTarget(Terminator bot, Location loc, EnumTargetGoal... targetGoal) {
LivingEntity result = null;
EnumTargetGoal g = goal;
@@ -1437,7 +1439,7 @@ public class LegacyAgent extends Agent {
case NEAREST_PLAYER: {
for (Player player : Bukkit.getOnlinePlayers()) {
if (validateCloserEntity(player, loc, result)) {
if (!botEntityCache.contains(player) && validateCloserEntity(player, loc, result)) {
result = player;
}
}
@@ -1447,7 +1449,7 @@ public class LegacyAgent extends Agent {
case NEAREST_VULNERABLE_PLAYER: {
for (Player player : Bukkit.getOnlinePlayers()) {
if (!PlayerUtils.isInvincible(player.getGameMode()) && validateCloserEntity(player, loc, result)) {
if (!botEntityCache.contains(player) && !PlayerUtils.isInvincible(player.getGameMode()) && validateCloserEntity(player, loc, result)) {
result = player;
}
}
@@ -1521,7 +1523,7 @@ public class LegacyAgent extends Agent {
case PLAYER: { //Target a single player. Defaults to NEAREST_VULNERABLE_PLAYER if no player found.
if (bot.getTargetPlayer() != null) {
Player player = Bukkit.getPlayer(bot.getTargetPlayer());
if (player != null && validateCloserEntity(player, loc, null)) {
if (player != null && !botEntityCache.contains(player) && validateCloserEntity(player, loc, null)) {
return player;
}
}