diff --git a/dScripts/RockHydrantBroken.cpp b/dScripts/RockHydrantBroken.cpp
index 0347466c..7895b00b 100644
--- a/dScripts/RockHydrantBroken.cpp
+++ b/dScripts/RockHydrantBroken.cpp
@@ -6,7 +6,7 @@ void RockHydrantBroken::OnStartup(Entity* self)
 {
 	self->AddTimer("playEffect", 1);
 
-	const auto hydrant = "hydrant0" + self->GetVar<std::string>(u"hydrant");
+	const auto hydrant = "hydrant" + self->GetVar<std::string>(u"hydrant");
 
 	const auto bouncers = EntityManager::Instance()->GetEntitiesInGroup(hydrant);
 
diff --git a/dScripts/RockHydrantSmashable.cpp b/dScripts/RockHydrantSmashable.cpp
index a54f0b9d..04b39c84 100644
--- a/dScripts/RockHydrantSmashable.cpp
+++ b/dScripts/RockHydrantSmashable.cpp
@@ -1,24 +1,23 @@
 #include "RockHydrantSmashable.h"
 #include "EntityManager.h"
-#include "SimplePhysicsComponent.h"
-#include "Entity.h"
-#include "GameMessages.h"
-#include "Game.h"
-#include "dLogger.h"
+#include "GeneralUtils.h"
 
-void RockHydrantSmashable::OnDie(Entity* self, Entity* killer) {
-	SimplePhysicsComponent* physics = self->GetComponent<SimplePhysicsComponent>();
-	NiPoint3 pos = physics->GetPosition();
+void RockHydrantSmashable::OnDie(Entity* self, Entity* killer)
+{
+	const auto hydrantName = self->GetVar<std::u16string>(u"hydrant");
 
-	EntityInfo info;
+	LDFBaseData* data = new LDFData<std::string>(u"hydrant", GeneralUtils::UTF16ToWTF8(hydrantName));
+
+	EntityInfo info {};
 	info.lot = 12293;
-	info.pos = pos;
-	info.spawner = nullptr;
+	info.pos = self->GetPosition();
+	info.rot = self->GetRotation();
+	info.settings = {data};
 	info.spawnerID = self->GetSpawnerID();
-	info.spawnerNodeID = 0;
 
-	Entity* newEntity = EntityManager::Instance()->CreateEntity(info, nullptr);
-	if (newEntity) {
-		EntityManager::Instance()->ConstructEntity(newEntity);
-	}
-}
\ No newline at end of file
+	Game::logger->Log("RockHydrantBroken", "Rock Hydrant spawned (%s)\n", data->GetString().c_str());
+
+    auto* hydrant = EntityManager::Instance()->CreateEntity(info);
+
+    EntityManager::Instance()->ConstructEntity(hydrant);
+}