simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-24 13:05:51 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes: maxShield is now set on user creation and vault objectId is set on world generation

Browse Source
This commit is contained in:
simon 2018-03-11 16:06:15 -04:00
parent 1d780f7d9b
commit cbde2450fa
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
View File

@ -463,4 +463,12 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Pr
return true; return true;
} }
public int getMaxShield() {
return maxShield;
}
public void setMaxShield(int maxShield) {
this.maxShield = maxShield;
}
} }

4
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/UserCreationListener.java
View File

@ -29,7 +29,7 @@ public class UserCreationListener implements GameEventListener {
cubot.addStatus(CubotStatus.FACTORY_NEW); cubot.addStatus(CubotStatus.FACTORY_NEW);
cubot.setObjectId(GameServer.INSTANCE.getGameUniverse().getNextObjectId()); cubot.setObjectId(GameServer.INSTANCE.getGameUniverse().getNextObjectId());
ServerConfiguration config = GameServer.INSTANCE.getConfig(); ServerConfiguration config = GameServer.INSTANCE.getConfig();
Point point = null; Point point = null;
while (point == null || cubot.getWorld() == null) { while (point == null || cubot.getWorld() == null) {
int spawnX = config.getInt("new_user_worldX") + random.nextInt(5); int spawnX = config.getInt("new_user_worldX") + random.nextInt(5);
@ -50,6 +50,8 @@ public class UserCreationListener implements GameEventListener {
cubot.setMaxEnergy(config.getInt("battery_max_energy")); cubot.setMaxEnergy(config.getInt("battery_max_energy"));
cubot.setHp(config.getInt("cubot_max_hp")); cubot.setHp(config.getInt("cubot_max_hp"));
cubot.setMaxHp(config.getInt("cubot_max_hp"));
cubot.setMaxShield(config.getInt("cubot_max_hp"));
cubot.setParent(user); cubot.setParent(user);
user.setControlledUnit(cubot); user.setControlledUnit(cubot);

1
Plugin NPC/src/main/java/net/simon987/npcplugin/event/WorldCreationListener.java
View File

@ -123,6 +123,7 @@ public class WorldCreationListener implements GameEventListener {
} }
} }
vaultDoor.setObjectId(GameServer.INSTANCE.getGameUniverse().getNextObjectId());
world.addObject(vaultDoor); world.addObject(vaultDoor);
world.incUpdatable(); //In case the Factory & Radio Tower couldn't be spawned. world.incUpdatable(); //In case the Factory & Radio Tower couldn't be spawned.
vaultDoor.setWorld(world); vaultDoor.setWorld(world);