kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

让流浪商人也感到恐慌

Browse source
This commit is contained in:
Atsuihsio 2025-01-09 20:53:27 +08:00
parent 9882b065cd
commit a4fb286a17
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java
View file

@ -18,7 +18,7 @@ import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.npc.Villager;
import net.minecraft.world.entity.npc.AbstractVillager;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.event.AnvilUpdateEvent;
@ -101,7 +101,7 @@ public class PlayerEventHandler {
public static void aimAtVillager(Player player) {
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom) {
Entity entity = TraceTool.findLookingEntity(player, 10);
if (entity instanceof Villager villager) {
if (entity instanceof AbstractVillager villager) {
List<Entity> entities = SeekTool.seekLivingEntities(villager, villager.level(), 16, 120);
for (var e : entities) {
if (e == player) {

10
src/main/java/com/atsuishio/superbwarfare/network/message/AimVillagerMessage.java
View file

@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.network.message;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ai.gossip.GossipType;
import net.minecraft.world.entity.npc.AbstractVillager;
import net.minecraft.world.entity.npc.Villager;
import net.minecraft.world.entity.schedule.Activity;
import net.minecraftforge.network.NetworkEvent;
@ -31,10 +32,13 @@ public class AimVillagerMessage {
if (sender == null) return;
Entity entity = sender.level().getEntity(message.villagerId);
if (entity instanceof Villager villager) {
villager.getBrain().setActiveActivityIfPossible(Activity.PANIC);
villager.getGossips().add(sender.getUUID(), GossipType.MINOR_NEGATIVE, 10);
if (entity instanceof AbstractVillager abstractVillager) {
if (entity instanceof Villager villager) {
villager.getGossips().add(sender.getUUID(), GossipType.MINOR_NEGATIVE, 10);
}
abstractVillager.getBrain().setActiveActivityIfPossible(Activity.PANIC);
}
});
context.get().setPacketHandled(true);
}