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

Factory Integration, NPC improvements. #19 & #31.

Browse Source
This commit is contained in:
simon
2017-12-24 14:26:19 -05:00
parent 4f1342593f
commit 2e9248ea2e
17 changed files with 334 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/src/main/java/net/simon987/server/game/ControllableUnit.java
View File

@@ -7,7 +7,7 @@ import java.util.ArrayList;
public interface ControllableUnit {
int getObjectId();
long getObjectId();
void setKeyboardBuffer(ArrayList<Integer> kbBuffer);

6
Server/src/main/java/net/simon987/server/game/GameObject.java
View File

@@ -18,7 +18,7 @@ public abstract class GameObject implements JSONSerialisable {
/**
* Object's unique identifier
*/
private int objectId;
private long objectId;
/**
* X coordinate of the object in its World
@@ -178,11 +178,11 @@ public abstract class GameObject implements JSONSerialisable {
}
public int getObjectId() {
public long getObjectId() {
return objectId;
}
public void setObjectId(int objectId) {
public void setObjectId(long objectId) {
this.objectId = objectId;
}

2
Server/src/main/java/net/simon987/server/game/GameUniverse.java
View File

@@ -241,7 +241,7 @@ public class GameUniverse implements JSONSerialisable {
}
public int getNextObjectId() {
public long getNextObjectId() {
return ++nextObjectId;
}