Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-25 05:54:55 +02:00
Code Issues Projects Releases Wiki Activity

Attempt to fix pufferfish puffed

Browse Source
This commit is contained in:
fullwall 2019-07-11 23:26:05 +08:00
parent 82e4f2dcea
commit 4f4e7dd68d
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java
View File

@ -191,12 +191,27 @@ public class PufferFishController extends MobEntityController {
@Override
public void movementTick() {
boolean lastInWater = this.y;
int lastPuffState = getPuffState();
if (npc != null) {
this.y = false;
setPuffState(0);
}
super.movementTick();
if (npc != null) {
this.y = lastInWater;
setPuffState(lastPuffState);
}
}
@Override
public void tick() {
int lastPuffState = getPuffState();
if (npc != null) {
NMSImpl.resetPuffTicks(this);
}
super.tick();
if (npc != null) {
setPuffState(lastPuffState);
}
}
}

10
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
View File

@ -227,6 +227,7 @@ import net.minecraft.server.v1_14_R1.EntityMinecartAbstract;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.EntityPolarBear;
import net.minecraft.server.v1_14_R1.EntityPose;
import net.minecraft.server.v1_14_R1.EntityPufferFish;
import net.minecraft.server.v1_14_R1.EntityRabbit;
import net.minecraft.server.v1_14_R1.EntityShulker;
import net.minecraft.server.v1_14_R1.EntitySize;
@ -1551,6 +1552,14 @@ public class NMSImpl implements NMSBridge {
minecart.setDisplayBlockOffset(offset);
}
public static void resetPuffTicks(EntityPufferFish fish) {
try {
PUFFERFISH_C.invoke(fish, 0);
} catch (Throwable e) {
e.printStackTrace();
}
}
public static void sendPacket(Player player, Packet<?> packet) {
if (packet == null)
return;
@ -1696,6 +1705,7 @@ public class NMSImpl implements NMSBridge {
private static final MethodHandle NAVIGATION_WORLD_FIELD = NMS.getSetter(NavigationAbstract.class, "b");
public static final Location PACKET_CACHE_LOCATION = new Location(null, 0, 0, 0);
private static final MethodHandle PATHFINDING_RANGE = NMS.getGetter(NavigationAbstract.class, "p");
private static final MethodHandle PUFFERFISH_C = NMS.getSetter(EntityPufferFish.class, "c");
private static final MethodHandle RABBIT_FIELD = NMS.getGetter(EntityRabbit.class, "bz");
private static final Random RANDOM = Util.getFastRandom();
private static final MethodHandle SIZE_FIELD_GETTER = NMS.getGetter(Entity.class, "size");