Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-15 11:51:45 +01:00
Code Issues Projects Releases Wiki Activity

Reuse code, match more entity types

Browse Source
This commit is contained in:
fullwall 2012-10-30 11:02:25 +08:00
parent 7ed02943b7
commit 054fe89309
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -116,7 +116,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
if (npc == null) if (npc == null)
return; return;
az().a(); NMS.updateAI(this);
Navigation navigation = getNavigation(); Navigation navigation = getNavigation();
if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON)
motX = motY = motZ = 0; motX = motY = motZ = 0;
@ -134,10 +134,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
} }
private void moveOnCurrentHeading() { private void moveOnCurrentHeading() {
getControllerMove().c();
getControllerLook().a();
getControllerJump().b();
// taken from EntityLiving update method // taken from EntityLiving update method
if (bG) { if (bG) {
/* boolean inLiquid = H() || J(); /* boolean inLiquid = H() || J();

1
src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -241,6 +241,7 @@ public class NMS {
} }
public static void updateAI(EntityLiving entity) { public static void updateAI(EntityLiving entity) {
entity.az().a();
entity.getNavigation().e(); entity.getNavigation().e();
entity.getControllerMove().c(); entity.getControllerMove().c();
entity.getControllerLook().a(); entity.getControllerLook().a();

6
src/main/java/net/citizensnpcs/util/Util.java
View File

@ -82,7 +82,11 @@ public class Util {
if (type != null) if (type != null)
return type; return type;
for (EntityType check : EntityType.values()) { for (EntityType check : EntityType.values()) {
if (check.name().matches(toMatch) || check.name().replace('_', '-').equalsIgnoreCase(toMatch)) { String name = check.name();
if (name.matches(toMatch) || name.equalsIgnoreCase(toMatch)
|| name.replace("_", "").equalsIgnoreCase(toMatch)
|| name.replace('_', '-').equalsIgnoreCase(toMatch)
|| name.replace('_', ' ').equalsIgnoreCase(toMatch) || name.startsWith(toMatch)) {
type = check; type = check;
break; break;
} }