valerie
/
hadean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes

world-object-unification-project
Ivory 2023-01-10 03:57:39 -05:00
parent 17171f4e6e
commit fa0c8e002d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
View File

@ -1,7 +1,9 @@
package xyz.valnet.hadean.gameobjects; package xyz.valnet.hadean.gameobjects;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import xyz.valnet.engine.math.Vector2i; import xyz.valnet.engine.math.Vector2i;
import xyz.valnet.engine.math.Vector4f; import xyz.valnet.engine.math.Vector4f;
@ -28,7 +30,7 @@ public class Tile extends WorldObject implements IWorkable {
private final int tileSelector = (int)Math.floor(Math.random() * 4); private final int tileSelector = (int)Math.floor(Math.random() * 4);
private boolean rocks = false; private boolean rocks = false;
private List<ITileThing> stuff = new ArrayList<ITileThing>(); private Set<ITileThing> stuff = new HashSet<ITileThing>();
// TODO remove remove queue, cause like, we dont iterate over // TODO remove remove queue, cause like, we dont iterate over
// things? so why remove queue them? that just leads to unneccesary // things? so why remove queue them? that just leads to unneccesary
// timing issues. you dumb fuck. // timing issues. you dumb fuck.

2
src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
View File

@ -42,7 +42,7 @@ public class Pawn extends Agent {
public void pickupItemByPredicate(IItemPredicate itemPredicate) { public void pickupItemByPredicate(IItemPredicate itemPredicate) {
Item item = getTile().pickupByItemPredicate(itemPredicate); Item item = getTile().pickupByItemPredicate(itemPredicate);
dropoffItem(item); inventory.add(item);
} }
public void pickupItem(Item i) { public void pickupItem(Item i) {