Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test fix for phantoms

This commit is contained in:
fullwall 2021-06-13 03:24:11 +08:00
parent f2d4c38843
commit 8d17d85392
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_16_R3.BlockPosition;
import net.minecraft.server.v1_16_R3.ControllerLook;
import net.minecraft.server.v1_16_R3.ControllerMove;
import net.minecraft.server.v1_16_R3.DamageSource;
import net.minecraft.server.v1_16_R3.DataWatcherObject;
import net.minecraft.server.v1_16_R3.Entity;
import net.minecraft.server.v1_16_R3.EntityBoat;
import net.minecraft.server.v1_16_R3.EntityMinecartAbstract;
@ -43,6 +44,7 @@ public class PhantomController extends MobEntityController {
}
public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder {
boolean calledNMSHeight = false;
private final CitizensNPC npc;
private ControllerLook oldLookController;
private ControllerMove oldMoveController;
@ -65,6 +67,17 @@ public class PhantomController extends MobEntityController {
}
}
@Override
public void a(DataWatcherObject<?> datawatcherobject) {
if (npc != null && !calledNMSHeight) {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
}
super.a(datawatcherobject);
}
@Override
protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) {
if (npc == null || !npc.isFlyable()) {

13
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.Difficulty;
import net.minecraft.world.damagesource.DamageSource;
@ -42,6 +43,7 @@ public class PhantomController extends MobEntityController {
}
public static class EntityPhantomNPC extends Phantom implements NPCHolder {
boolean calledNMSHeight = false;
private final CitizensNPC npc;
private LookControl oldLookController;
private MoveControl oldMoveController;
@ -186,6 +188,17 @@ public class PhantomController extends MobEntityController {
}
}
@Override
public void onSyncedDataUpdated(EntityDataAccessor<?> datawatcherobject) {
if (npc != null && !calledNMSHeight) {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
}
super.onSyncedDataUpdated(datawatcherobject);
}
@Override
public void push(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View File

@ -1465,7 +1465,6 @@ public class NMSImpl implements NMSBridge {
size = (EntityDimensions) SIZE_FIELD_GETTER.invoke(living);
} catch (Throwable e) {
e.printStackTrace();
living.onSyncedDataUpdated(datawatcherobject);
return;
}
float oldw = size.width;