simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 18:46:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #54

Browse Source
This commit is contained in:
simon 2017-12-28 20:33:57 -05:00
parent dab5cab602
commit 2fb7d2f73e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,6 +149,10 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit {
return lastAction; return lastAction;
} }
public Action getCurrentAction() {
return currentAction;
}
public void setHologram(char hologram) { public void setHologram(char hologram) {
this.hologram = hologram; this.hologram = hologram;
} }

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

@ -42,7 +42,7 @@ public class CubotDrill extends CpuHardware {
} else if (a == GATHER_SLOW || a == GATHER_FAST) { } else if (a == GATHER_SLOW || a == GATHER_FAST) {
if (cubot.spendEnergy(1400)) { if (cubot.spendEnergy(1400)) {
if (cubot.getAction() == Action.IDLE) { if (cubot.getCurrentAction() == Action.IDLE) {
int tile = cubot.getWorld().getTileMap().getTileAt(cubot.getX(), cubot.getY()); int tile = cubot.getWorld().getTileMap().getTileAt(cubot.getX(), cubot.getY());
if (tile == TileMap.IRON_TILE) { if (tile == TileMap.IRON_TILE) {

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

@ -49,7 +49,7 @@ public class CubotLaser extends CpuHardware {
ArrayList<GameObject> objects = cubot.getWorld().getGameObjectsAt(frontTile.x, frontTile.y); ArrayList<GameObject> objects = cubot.getWorld().getGameObjectsAt(frontTile.x, frontTile.y);
if (cubot.getAction() == Action.IDLE && objects.size() > 0) { if (cubot.getCurrentAction() == Action.IDLE && objects.size() > 0) {
//FIXME: Problem here if more than 1 object //FIXME: Problem here if more than 1 object
if (objects.get(0) instanceof InventoryHolder) { if (objects.get(0) instanceof InventoryHolder) {
if (((InventoryHolder) objects.get(0)).canTakeItem(b)) { if (((InventoryHolder) objects.get(0)).canTakeItem(b)) {
@ -62,6 +62,8 @@ public class CubotLaser extends CpuHardware {
} }
} }
} }
} else {
System.out.println("\n\n\n\n\n It did it");
} }