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

Fix villager interacting in 1.15

Browse Source
This commit is contained in:
fullwall 2020-03-16 09:46:03 +08:00
parent 46b1ba6e98
commit a6fbb31de6
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java
View File

@ -125,15 +125,6 @@ public class VillagerController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public boolean dY() {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.dY();
}
@Override
public void e(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
@ -156,6 +147,15 @@ public class VillagerController extends MobEntityController {
}
}
@Override
public boolean et() {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.et();
}
@Override
public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {

54
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java
View File

@ -121,15 +121,6 @@ public class WanderingTraderController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public boolean dY() {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.dY();
}
@Override
public void e(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
@ -153,25 +144,12 @@ public class WanderingTraderController extends MobEntityController {
}
@Override
public void h(double x, double y, double z) {
if (npc == null) {
super.h(x, y, z);
return;
public boolean et() {
if (blockingATrade) {
blockingATrade = false;
return true;
}
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z);
return;
}
Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) {
vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ());
}
// when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is
// cancelled.
return super.et();
}
@Override
@ -202,6 +180,28 @@ public class WanderingTraderController extends MobEntityController {
return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA);
}
@Override
public void h(double x, double y, double z) {
if (npc == null) {
super.h(x, y, z);
return;
}
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z);
return;
}
Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) {
vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ());
}
// when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is
// cancelled.
}
public boolean isBlockingTrades() {
return blockTrades;
}

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
View File

@ -137,9 +137,9 @@ public class PlayerAnimationImpl {
NMSImpl.sendPacketNearby(player.getBukkitEntity(), player.getBukkitEntity().getLocation(), packet, radius);
}
private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
private static final MethodHandle ENTITY_SETPOSE_METHOD = NMS.getMethodHandle(Entity.class, "setPose", true,
EntityPose.class);
private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
static {
DEFAULTS.put(PlayerAnimation.ARM_SWING, 0);
DEFAULTS.put(PlayerAnimation.HURT, 1);