simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-10-31 08:16:52 +00:00
Code Issues Projects Releases Wiki Activity

Fixed crash when an empty item is cleared.

Browse Source
This commit is contained in:
chromapid 2021-12-20 23:50:17 -07:00
parent 292f737971
commit ad16df32d7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/simon987/mar/cubot/CubotInventory.java
View File

@ -55,14 +55,19 @@ public class CubotInventory extends HardwareModule {
private void scanItem() { private void scanItem() {
int x = getCpu().getRegisterSet().getRegister("X").getValue(); int x = getCpu().getRegisterSet().getRegister("X").getValue();
Item item = inventory.get(position); Item item = inventory.get(position);
if (item != null) {
item.clear(unit);
inventory.remove(position);
item.digitize(unit.getCpu().getMemory(), x); item.digitize(unit.getCpu().getMemory(), x);
} }
}
public Item clearItem() { public Item clearItem() {
Item item = inventory.get(position); Item item = inventory.get(position);
if (item != null) {
item.clear(unit); item.clear(unit);
inventory.remove(position); inventory.remove(position);
}
return item; return item;
} }