1
0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-11 10:57:47 +01:00

Override an ocelot method

This commit is contained in:
fullwall 2018-02-18 18:56:19 +08:00
parent 1bc5a47ae8
commit d14119bc38
4 changed files with 23 additions and 2 deletions
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity

View File

@ -88,6 +88,13 @@ public class OcelotController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
protected void df() {
if (npc == null) {
super.df();
}
}
@Override
public void e(float f, float f1) {
if (npc == null || !npc.isFlyable()) {
@ -189,6 +196,7 @@ public class OcelotController extends MobEntityController {
return false;
}
}
}
public static class OcelotNPC extends CraftOcelot implements NPCHolder {

View File

@ -88,6 +88,13 @@ public class OcelotController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
protected void di() {
if (npc == null) {
super.di();
}
}
@Override
public void e(float f, float f1) {
if (npc == null || !npc.isFlyable()) {
@ -190,6 +197,7 @@ public class OcelotController extends MobEntityController {
return false;
}
}
}
public static class OcelotNPC extends CraftOcelot implements NPCHolder {

View File

@ -543,9 +543,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
}
private static final String[][] EMPTY_PROGRESS = new String[0][0];
private static final float EPSILON = 0.005F;
private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0);
private static final Field PROGRESS_TRACKER_FIELD = NMS.getField(AdvancementProgress.class, "b");
}

View File

@ -98,6 +98,13 @@ public class OcelotController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
protected void dm() {
if (npc == null) {
super.dm();
}
}
@Override
public void e(float f, float f1) {
if (npc == null || !npc.isFlyable()) {