From 6335312b3c51c80b7d22f7204c549573b4c0da33 Mon Sep 17 00:00:00 2001
From: Susan <su+git@angel-island.zone>
Date: Tue, 4 Jun 2024 10:59:57 +0100
Subject: [PATCH] Codechange: don't remove trees only to immediately replant
 them

---
 src/tree_cmd.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 2fe5817432..2705b310d1 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -802,7 +802,7 @@ static void TileLoop_Trees(TileIndex tile)
 			break;
 
 		case 6: // final stage of tree destruction
-			if (!CanPlantExtraTrees(tile)) {
+			if (!CanPlantExtraTrees(tile) || (_settings_game.game_creation.tree_placer == TP_IMPROVED && !IsNearbyForest(tile))) {
 				/* if trees can't spread just plant a new one to prevent deforestation */
 				SetTreeGrowth(tile, 0);
 			} else if (GetTreeCount(tile) > 1) {
@@ -810,12 +810,6 @@ static void TileLoop_Trees(TileIndex tile)
 				AddTreeCount(tile, -1);
 				SetTreeGrowth(tile, 3);
 			} else {
-				/* Backups the type of tree if using improved trees */
-				TreeType treetype;
-				if (_settings_game.game_creation.tree_placer == TP_IMPROVED && IsTileType(tile, MP_TREES)) {
-					treetype = GetTreeType(tile);
-				}
-
 				/* just one tree, change type into MP_CLEAR */
 				switch (GetTreeGround(tile)) {
 					case TREE_GROUND_SHORE: MakeShore(tile); break;
@@ -837,11 +831,6 @@ static void TileLoop_Trees(TileIndex tile)
 						}
 						break;
 				}
-
-				/* When using improved trees, when a "alone" tree is dead, a new one is planted immediately. */
-				if (_settings_game.game_creation.tree_placer == TP_IMPROVED && !IsNearbyForest(tile)) {
-					PlantTreesOnTile(tile, treetype, 0, 0);
-				}
 			}
 			break;