Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-19 05:42:04 +01:00
Code Issues Projects Releases Wiki Activity

Stop allay picking up loot if protected

Browse Source
This commit is contained in:
fullwall 2022-06-17 20:41:34 +08:00
parent a64ad43d11
commit 552d25494b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java
View File

@ -61,6 +61,13 @@ public class AllayController extends MobEntityController {
}
}
@Override
public boolean canPickUpLoot() {
if (npc != null && npc.isProtected())
return false;
return super.canPickUpLoot();
}
@Override
protected boolean canRide(Entity entity) {
if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {

1
v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java
View File

@ -92,7 +92,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
ProfilePublicKey ppk, NPC npc) {
super(minecraftServer, world, gameProfile, ppk);
this.npc = (CitizensNPC) npc;
if (npc != null) {
skinTracker = new SkinPacketTracker(this);
try {