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

Fix crashes

Browse Source
This commit is contained in:
fullwall 2020-06-26 19:20:43 +08:00
parent 19013fc94f
commit b62780a91e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/CowController.java
View File

@ -93,12 +93,12 @@ public class CowController extends MobEntityController {
@Override
public EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
if (npc == null || !npc.isProtected())
return super.a(entityhuman, enumhand);
return super.b(entityhuman, enumhand);
ItemStack itemstack = entityhuman.b(enumhand);
if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
return EnumInteractionResult.FAIL;
}
return super.a(entityhuman, enumhand);
return super.b(entityhuman, enumhand);
}
@Override

2
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/MushroomCowController.java
View File

@ -79,7 +79,7 @@ public class MushroomCowController extends MobEntityController {
@Override
public EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
if (npc == null || !npc.isProtected())
return super.a(entityhuman, enumhand);
return super.b(entityhuman, enumhand);
return EnumInteractionResult.FAIL;
}

2
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ParrotController.java
View File

@ -56,7 +56,7 @@ public class ParrotController extends MobEntityController {
public EnumInteractionResult b(EntityHuman paramEntityHuman, EnumHand paramEnumHand) {
// block feeding
if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
return super.a(paramEntityHuman, paramEnumHand);
return super.b(paramEntityHuman, paramEnumHand);
}
return EnumInteractionResult.FAIL;
}

2
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/VillagerController.java
View File

@ -96,7 +96,7 @@ public class VillagerController extends MobEntityController {
list.clear();
}
}
return super.a(entityhuman, enumhand);
return super.b(entityhuman, enumhand);
}
@Override

2
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/WanderingTraderController.java
View File

@ -92,7 +92,7 @@ public class WanderingTraderController extends MobEntityController {
list.clear();
}
}
return super.a(entityhuman, enumhand);
return super.b(entityhuman, enumhand);
}
@Override