simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-15 23:59:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge a3064ef8d6 into 6fc583d6f0

Browse Source
This commit is contained in:
Jaggernaut555
2018-01-09 13:08:30 +00:00
committed by GitHub
parent 6fc583d6f0 a3064ef8d6
commit faf61d8f38
5 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Plugin NPC/src/main/java/net/simon987/npcplugin/NonPlayerCharacter.java
View File

@@ -108,7 +108,7 @@ public abstract class NonPlayerCharacter extends GameObject implements Updatable
LogManager.LOGGER.severe("FIXME: moveTo:NonPlayerCharacter, Direction is null");
}
if (incrementLocation()) {
if (incrementLocation(1)) {
lastAction = Action.WALKING;
return true;
}
@@ -131,7 +131,7 @@ public abstract class NonPlayerCharacter extends GameObject implements Updatable
getWorld().getX(), getWorld().getY() - 1) <= MAX_FACTORY_DISTANCE) {
if (!moveTo(8, 0, 0)) {
setDirection(Direction.NORTH);
incrementLocation();
incrementLocation(1);
}
return true;
} else {
@@ -143,7 +143,7 @@ public abstract class NonPlayerCharacter extends GameObject implements Updatable
getWorld().getX() + 1, getWorld().getY()) <= MAX_FACTORY_DISTANCE) {
if (!moveTo(15, 7, 0)) {
setDirection(Direction.EAST);
incrementLocation();
incrementLocation(1);
}
return true;
} else {
@@ -154,7 +154,7 @@ public abstract class NonPlayerCharacter extends GameObject implements Updatable
getWorld().getX(), getWorld().getY() + 1) <= MAX_FACTORY_DISTANCE) {
if (!moveTo(8, 15, 0)) {
setDirection(Direction.SOUTH);
incrementLocation();
incrementLocation(1);
}
return true;
} else {
@@ -165,7 +165,7 @@ public abstract class NonPlayerCharacter extends GameObject implements Updatable
getWorld().getX() - 1, getWorld().getY()) <= MAX_FACTORY_DISTANCE) {
if (!moveTo(0, 7, 0)) {
setDirection(Direction.WEST);
incrementLocation();
incrementLocation(1);
}
return true;
} else {