feat: features OTCR natively in canary

src/creatures/creature.cpp

@@ -2004,15 +2004,15 @@ void Creature::sendAsyncTasks() {
 }
 
 void Creature::attachEffectById(uint16_t id) {
-	auto it = std::find(attachedEffectList.begin(), attachedEffectList.end(), id);
+	auto it = std::ranges::find(attachedEffectList, id);
 	if (it != attachedEffectList.end()) {
 		return;
 	}
 	attachedEffectList.push_back(id);
 	g_game().sendAttachedEffect(static_self_cast<Creature>(), id);
 }
 void Creature::detachEffectById(uint16_t id) {
-	auto it = std::find(attachedEffectList.begin(), attachedEffectList.end(), id);
+	auto it = std::ranges::find(attachedEffectList, id);
 	if (it == attachedEffectList.end()) {
 		return;
 	}

src/creatures/creature.hpp

@@ -695,7 +695,7 @@ class Creature : virtual public Thing, public SharedObject {
 	std::string getShader() const {
 		return shader;
 	}
-	void setShader(const std::string &shaderName) {
+	void setShader(const std::string_view &shaderName) {
 		shader = shaderName;
 	}
 	void attachEffectById(uint16_t id);

src/creatures/players/player.cpp

@@ -9578,10 +9578,9 @@ void Player::sendAttachedEffect(const std::shared_ptr<Creature> &creature, uint1
 	if (!client || !creature) {
 		return;
 	}
+
 	if (creature->getPlayer()) {
-		if (client) {
-			client->sendAttachedEffect(creature, effectId);
-		}
+		client->sendAttachedEffect(creature, effectId);
 	}
 }
 
@@ -9590,33 +9589,33 @@ void Player::sendDetachEffect(const std::shared_ptr<Creature> &creature, uint16_
 		return;
 	}
 	if (creature->getPlayer()) {
-		if (client) {
-			client->sendDetachEffect(creature, effectId);
-		}
+		client->sendDetachEffect(creature, effectId);
 	}
 }
 
-void Player::sendShader(const std::shared_ptr<Creature> &creature, const std::string &shaderName) const {
+void Player::sendShader(const std::shared_ptr<Creature> &creature, const std::string_view &shaderName) const {
 	if (!client || !creature) {
 		return;
 	}
 	if (creature->getPlayer()) {
-		if (client) {
 			client->sendShader(creature, shaderName);
-		}
 	}
 }
 
-void Player::sendMapShader(const std::string &shaderName) const {
-	if (client) {
-		client->sendMapShader(shaderName);
+void Player::sendMapShader(const std::string_view &shaderName) const {
+	if (!client) {
+		return;
 	}
+
+	client->sendMapShader(shaderName);
 }
 
 void Player::sendPlayerTyping(const std::shared_ptr<Creature> &creature, uint8_t typing) const {
-	if (client) {
-		client->sendPlayerTyping(creature, typing);
+	if (!client) {
+		return;
 	}
+
+	client->sendPlayerTyping(creature, typing);
 }
 
 void Player::sendSingleSoundEffect(const Position &pos, SoundEffect_t id, SourceEffect_t source) const {

src/creatures/players/player.hpp

@@ -1264,12 +1264,12 @@ class Player final : public Creature, public Cylinder, public Bankable {
 
 	void sendAttachedEffect(const std::shared_ptr<Creature> &creature, uint16_t effectId) const;
 	void sendDetachEffect(const std::shared_ptr<Creature> &creature, uint16_t effectId) const;
-	void sendShader(const std::shared_ptr<Creature> &creature, const std::string &shaderName) const;
-	void sendMapShader(const std::string &shaderName) const;
-	const std::string &getMapShader() const {
+	void sendShader(const std::shared_ptr<Creature> &creature, const std::string_view &shaderName) const;
+	void sendMapShader(const std::string_view &shaderName) const;
+	const std::string_view &getMapShader() const {
 		return mapShader;
 	}
-	void setMapShader(const std::string &shaderName) {
+	void setMapShader(const std::string_view &shaderName) {
 		this->mapShader = shaderName;
 	}
 	void sendPlayerTyping(const std::shared_ptr<Creature> &creature, uint8_t typing) const;
@@ -1383,7 +1383,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	std::string name;
 	std::string guildNick;
 	std::string loyaltyTitle;
-	std::string mapShader;
+	std::string_view mapShader;
 
 	Skill skills[SKILL_LAST + 1];
 	LightInfo itemsLight;

src/game/game.cpp

@@ -10856,25 +10856,27 @@ void Game::updatePlayersOnline() const {
 void Game::sendAttachedEffect(const std::shared_ptr<Creature> &creature, uint16_t effectId) {
 	auto spectators = Spectators().find<Player>(creature->getPosition(), true);
 	for (const auto &spectator : spectators) {
-		auto player = spectator->getPlayer();
+		const auto &player = spectator->getPlayer();
 		if (player) {
 			player->sendAttachedEffect(creature, effectId);
 		}
 	}
 }
+
 void Game::sendDetachEffect(const std::shared_ptr<Creature> &creature, uint16_t effectId) {
 	auto spectators = Spectators().find<Player>(creature->getPosition(), true);
 	for (const auto &spectator : spectators) {
-		auto player = spectator->getPlayer();
+		const auto &player = spectator->getPlayer();
 		if (player) { 
 			player->sendDetachEffect(creature, effectId);
 		}
 	}
 }
+
 void Game::updateCreatureShader(const std::shared_ptr<Creature> &creature) {
 	auto spectators = Spectators().find<Player>(creature->getPosition(), true);
 	for (const auto &spectator : spectators) {
-		auto player = spectator->getPlayer();
+		const auto &player = spectator->getPlayer();
 		if (player) {
 			player->sendShader(creature, creature->getShader());
 		}
@@ -10886,7 +10888,6 @@ void Game::playerSetTyping(uint32_t playerId, uint8_t typing) {
 	if (!player) {
 		return;
 	}
-
 	for (const auto &spectator : Spectators().find<Player>(player->getPosition(), true)) {
 		if (const auto &tmpPlayer = spectator->getPlayer()) {
 			tmpPlayer->sendPlayerTyping(player, typing);

src/items/item.hpp

@@ -141,20 +141,20 @@ class ItemProperties {
 		return getCorpseOwner() == static_cast<uint32_t>(std::numeric_limits<int32_t>::max());
 	}
 
-	void setShader(const std::string &shaderName) {
+	void setShader(const std::string_view &shaderName) {
 		if (shaderName.empty()) {
 			removeCustomAttribute("shader");
 			return;
 		}
 
-		setCustomAttribute("shader", shaderName);
+		setCustomAttribute("shader", std::string(shaderName)); // temp
 	}
 
 	bool hasShader() const {
 		return getCustomAttribute("shader") != nullptr;
 	}
 
-	std::string getShader() const {
+	std::string_view getShader() const {
 		const CustomAttribute* shader = getCustomAttribute("shader");
 		return shader ? shader->getString() : "";
 	}

src/lua/functions/creatures/player/player_functions.cpp

@@ -4472,7 +4472,7 @@ int PlayerFunctions::luaPlayerGetMapShader(lua_State* L) {
 		return 0;
 	}
 
-	pushString(L, player->getMapShader());
+	pushString(L, std::string(player->getMapShader())); // temp
 	return 1;
 }
 

src/lua/functions/items/item_functions.cpp

@@ -1062,7 +1062,7 @@ int ItemFunctions::luaItemGetShader(lua_State* L) {
 		return 1;
 	}
 
-	pushString(L, item->getShader());
+	pushString(L, std::string(item->getShader())); // temp
 	return 1;
 }
 
@@ -1076,6 +1076,7 @@ int ItemFunctions::luaItemSetShader(lua_State* L) {
 	}
 
 	item->setShader(getString(L, 2));
+	g_game().refreshItem(item);
 	pushBoolean(L, true);
 	return 1;
 }

src/server/network/protocol/protocolgame.cpp

@@ -470,7 +470,7 @@ void ProtocolGame::AddItem(NetworkMessage &msg, const std::shared_ptr<Item> &ite
 
 	// OTCR Features
 	if (isOTC && otclientV8 == 0) {
-		msg.addString(item->getShader());
+		msg.addString(std::string(item->getShader())); // temp
 	}
 }
 
@@ -9320,7 +9320,7 @@ void ProtocolGame::sendAttachedEffect(const std::shared_ptr<Creature> &creature,
 		return;
 	}
 
-	 NetworkMessage msg;
+	NetworkMessage msg;
 	msg.addByte(0x34);
 	msg.add<uint32_t>(creature->getID());
 	msg.add<uint16_t>(effectId);
@@ -9339,24 +9339,24 @@ void ProtocolGame::sendDetachEffect(const std::shared_ptr<Creature> &creature, u
 	writeToOutputBuffer(msg);
 }
 
-void ProtocolGame::sendShader(const std::shared_ptr<Creature> &creature, const std::string &shaderName) {
+void ProtocolGame::sendShader(const std::shared_ptr<Creature> &creature, const std::string_view &shaderName) {
 	if (!isOTC || player->getOperatingSystem() >= CLIENTOS_OTCLIENTV8_LINUX) {
 		return;
 	}
 	NetworkMessage msg;
 	msg.addByte(0x36);
 	msg.add<uint32_t>(creature->getID());
-	msg.addString(shaderName);
+	msg.addString(std::string(shaderName)); // temp
 	writeToOutputBuffer(msg);
 }
 
-void ProtocolGame::sendMapShader(const std::string &shaderName) {
+void ProtocolGame::sendMapShader(const std::string_view &shaderName) {
 	if (!isOTC || player->getOperatingSystem() >= CLIENTOS_OTCLIENTV8_LINUX) {
 		return;
 	}
 	NetworkMessage msg;
 	msg.addByte(0x37);
-	msg.addString(shaderName);
+	msg.addString(std::string(shaderName)); // temp
 	writeToOutputBuffer(msg);
 }
 

src/server/network/protocol/protocolgame.hpp

@@ -493,8 +493,8 @@ class ProtocolGame final : public Protocol {
 	void sendOTCRFeatures();
 	void sendAttachedEffect(const std::shared_ptr<Creature> &creature, uint16_t effectId);
 	void sendDetachEffect(const std::shared_ptr<Creature> &creature, uint16_t effectId);
-	void sendShader(const std::shared_ptr<Creature> &creature, const std::string &shaderName);
-	void sendMapShader(const std::string &shaderName);
+	void sendShader(const std::shared_ptr<Creature> &creature, const std::string_view &shaderName);
+	void sendMapShader(const std::string_view &shaderName);
 	void sendPlayerTyping(const std::shared_ptr<Creature> &creature, uint8_t typing);
 	void parsePlayerTyping(NetworkMessage &msg);