From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001
From: daoge <3523206925@qq.com>
Date: Tue, 3 Mar 2026 03:04:10 +0800
Subject: feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
---
 Minecraft.World/Bush.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Minecraft.World/Bush.cpp')

diff --git a/Minecraft.World/Bush.cpp b/Minecraft.World/Bush.cpp
index e6cd7c85..6f8e8d91 100644
--- a/Minecraft.World/Bush.cpp
+++ b/Minecraft.World/Bush.cpp
@@ -5,13 +5,13 @@
 
 void Bush::_init()
 {
-    setTicking(true);
-    updateDefaultShape();
+	setTicking(true);
+	updateDefaultShape();
 }
 
 Bush::Bush(int id, Material *material) : Tile(id, material, isSolidRender())
 {
-    _init();
+	_init();
 }
 
 Bush::Bush(int id) : Tile(id, Material::plant, isSolidRender())
@@ -22,8 +22,8 @@ Bush::Bush(int id) : Tile(id, Material::plant, isSolidRender())
 // 4J Added override
 void Bush::updateDefaultShape()
 {
-    float ss = 0.2f;
-    this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 3, 0.5f + ss);
+	float ss = 0.2f;
+	setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 3, 0.5f + ss);
 }
 
 bool Bush::mayPlace(Level *level, int x, int y, int z)
@@ -49,11 +49,11 @@ void Bush::tick(Level *level, int x, int y, int z, Random *random)
 
 void Bush::checkAlive(Level *level, int x, int y, int z)
 {
-    if (!canSurvive(level, x, y, z))
+	if (!canSurvive(level, x, y, z))
 	{
-        this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
-        level->setTile(x, y, z, 0);
-    }
+		this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
+		level->setTileAndData(x, y, z, 0, 0, UPDATE_CLIENTS);
+	}
 }
 
 bool Bush::canSurvive(Level *level, int x, int y, int z)
-- 
cgit v1.2.3