From fed342aa6279681743911166b0c50eed23b6d1ed Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Thu, 3 Apr 2025 17:15:51 -0400
Subject: [PATCH] fix bush loot pool

---
 assets/Data/entity/foliage/bushes.json                        | 2 +-
 docs/src/progress/renderertodo.md                             | 1 +
 .../java/electrosphere/entity/state/life/ServerLifeTree.java  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets/Data/entity/foliage/bushes.json b/assets/Data/entity/foliage/bushes.json
index 5cb07a3f..ef19f8e6 100644
--- a/assets/Data/entity/foliage/bushes.json
+++ b/assets/Data/entity/foliage/bushes.json
@@ -19,7 +19,7 @@
                     "tickets" : [
                         {
                             "itemId" : "Stick",
-                            "rarity" : 0.8,
+                            "rarity" : 1.0,
                             "minQuantity" : 1,
                             "maxQuantity" : 1
                         }
diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index e9623dd7..0c6ed1c5 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1429,6 +1429,7 @@ Break out interaction ray casting into dedicated collision engine object
 Bush hitbox
 Harvesting interaction happens on server
 Fix PoseActor position/rotation caching bug
+Bush drops sticks
 
 
 
diff --git a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
index 7b2efa5d..98fa4086 100644
--- a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
+++ b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
@@ -128,8 +128,8 @@ public class ServerLifeTree implements BehaviorTree {
         Vector3d position = new Vector3d(EntityUtils.getPosition(parent));
         Realm realm = Globals.realmManager.getEntityRealm(parent);
         for(LootTicket ticket : this.healthSystem.getLootPool().getTickets()){
-            if(random.nextDouble() < ticket.getRarity()){
-                int numToGen = random.nextInt(ticket.getMinQuantity(), ticket.getMaxQuantity());
+            if(random.nextDouble() <= ticket.getRarity()){
+                int numToGen = random.nextInt(ticket.getMinQuantity(), ticket.getMaxQuantity()+1);
                 for(int i = 0; i < numToGen; i++){
                     ItemUtils.serverSpawnBasicItem(realm, position, ticket.getItemId());
                 }