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

Merge pull request #53 from Badbird5907/master

Browse Source 
fixed ClassCastException, and made mobs not target the bot by default
This commit is contained in:
Badbird5907
2022-08-11 19:17:05 -04:00
committed by GitHub
parent eca25d3355 2dd068186f
commit bac762f00c
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java
View File

@@ -72,6 +72,7 @@ public class Bot extends ServerPlayer implements Terminator {
private byte groundTicks;
private byte jumpTicks;
private byte noFallTicks;
private boolean ignoredByMobs = true;
private Bot(MinecraftServer minecraftServer, ServerLevel worldServer, GameProfile profile) {
super(minecraftServer, worldServer, profile, null);
@@ -677,7 +678,7 @@ public class Bot extends ServerPlayer implements Terminator {
if (playerInstance && !isAlive()) {
agent.onBotKilledByPlayer(new BotKilledByPlayerEvent(this, killer));
}else {
} else {
kb(getLocation(), attacker.getBukkitEntity().getLocation(), attacker);
}
}
@@ -685,11 +686,11 @@ public class Bot extends ServerPlayer implements Terminator {
return damaged;
}
private void kb(Location loc1, Location loc2,Entity attacker) {
private void kb(Location loc1, Location loc2, Entity attacker) {
Vector vel = loc1.toVector().subtract(loc2.toVector()).setY(0).normalize().multiply(0.3);
if (isBotOnGround()) vel.multiply(0.8).setY(0.4);
if(((Player)attacker.getBukkitEntity()).getInventory().getItemInMainHand().getItemMeta()!=null) {
if (attacker.getBukkitEntity() instanceof Player && ((Player) attacker.getBukkitEntity()).getInventory().getItemInMainHand().getItemMeta() != null) {
if (((Player) attacker.getBukkitEntity()).getInventory().getItemInMainHand().getItemMeta().hasEnchant(Enchantment.KNOCKBACK) && attacker.getBukkitEntity() instanceof Player) {
int kbLevel = ((Player) attacker.getBukkitEntity()).getInventory().getItemInMainHand().getItemMeta().getEnchants().get(Enchantment.KNOCKBACK);
if (kbLevel == 1) {
@@ -843,4 +844,12 @@ public class Bot extends ServerPlayer implements Terminator {
this.yRotO = this.getYRot();
this.xRotO = this.getXRot();
}
public boolean isIgnoredByMobs() {
return ignoredByMobs;
}
public void setIgnoredByMobs(boolean ignoredByMobs) {
this.ignoredByMobs = ignoredByMobs;
}
}

9
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java
View File

@@ -17,6 +17,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
@@ -207,4 +208,12 @@ public class BotManagerImpl implements BotManager, Listener {
agent.onBotDeath(new BotDeathEvent(event, bot));
}
}
@EventHandler
public void onMobTarget(EntityTargetLivingEntityEvent event) {
Bot bot = (Bot) getBot(event.getEntity().getUniqueId());
if (bot != null && bot.isIgnoredByMobs()) {
event.setCancelled(true);
}
}
}