From fa0c8e002db3a6314bec3722250f84728259f9f1 Mon Sep 17 00:00:00 2001 From: Ivory Date: Tue, 10 Jan 2023 03:57:39 -0500 Subject: [PATCH] minor fixes --- src/main/java/xyz/valnet/hadean/gameobjects/Tile.java | 4 +++- .../xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java index f76ec8a..ac3bf91 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java @@ -1,7 +1,9 @@ package xyz.valnet.hadean.gameobjects; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import xyz.valnet.engine.math.Vector2i; 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 boolean rocks = false; - private List stuff = new ArrayList(); + private Set stuff = new HashSet(); // TODO remove remove queue, cause like, we dont iterate over // things? so why remove queue them? that just leads to unneccesary // timing issues. you dumb fuck. diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java index d73a903..b6dd62f 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java @@ -42,7 +42,7 @@ public class Pawn extends Agent { public void pickupItemByPredicate(IItemPredicate itemPredicate) { Item item = getTile().pickupByItemPredicate(itemPredicate); - dropoffItem(item); + inventory.add(item); } public void pickupItem(Item i) {