From 6684685679c2c47f4a9b20273a0dd7be087b53f6 Mon Sep 17 00:00:00 2001
From: unknown <uniior73141@protonmail.com>
Date: Wed, 14 Jun 2023 13:49:40 -0400
Subject: [PATCH] Attempt to fix BarrelCactus

---
 common/src/terrain/sprite.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index c7ce6a464d..9918ddc3b5 100644
--- a/common/src/terrain/sprite.rs
+++ b/common/src/terrain/sprite.rs
@@ -267,6 +267,7 @@ impl SpriteKind {
             SpriteKind::BedrollSnow => 0.4,
             SpriteKind::BedrollPirate => 0.3,
             SpriteKind::Tomato => 1.65,
+            SpriteKind::BarrelCactus => 1.0,
             SpriteKind::LargeCactus => 3.0,
             SpriteKind::TallCactus => 2.5,
             SpriteKind::Scarecrow => 3.0,
@@ -325,8 +326,7 @@ impl SpriteKind {
             SpriteKind::IceSpike => 1.0,
             SpriteKind::RepairBench => 1.2,
             // TODO: Find suitable heights.
-            SpriteKind::BarrelCactus
-            | SpriteKind::RoundCactus
+            SpriteKind::RoundCactus
             | SpriteKind::ShortCactus
             | SpriteKind::MedFlatCactus
             | SpriteKind::ShortFlatCactus