* torch no degrade while shapeshifted

TurningWheel · Aug 29, 2023 · eb2a3b0 · eb2a3b0
1 parent 8bb1d9e
commit eb2a3b0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/entity.cpp b/src/entity.cpp
@@ -3817,7 +3817,11 @@ void Entity::handleEffects(Stat* myStats)
 			if ( (this->char_torchtime >= 7500 && myStats->shield->type == TOOL_TORCH) || (this->char_torchtime >= 10500) )
 			{
 				this->char_torchtime = 0;
-				if ( myStats->shield->type == TOOL_TORCH && player >= 0 )
+				if ( behavior == &actPlayer && effectShapeshift != NOTHING )
+				{
+					// do nothing, shapeshifted
+				}
+				else if ( myStats->shield->type == TOOL_TORCH && player >= 0 )
 				{
 					std::string itemName = myStats->shield->getName();
 					ItemType itemType = myStats->shield->type;