From e0c4bcf4e033a51c12d3ea3ade23d099812aca08 Mon Sep 17 00:00:00 2001 From: Nuno Date: Tue, 9 Feb 2021 17:56:09 +0100 Subject: [PATCH] Merge branch 'new_features' --- .../player_manager/character_inventory_manipulation.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp index 48c7f4f89..3aa19f78a 100644 --- a/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp +++ b/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp @@ -3330,10 +3330,6 @@ void CCharacter::useItem(uint32 slot) fx.Aura = MAGICFX::NoAura; } } - else if (getOrganization() == 5 && CFameInterface::getInstance().getFameIndexed(_Id, PVP_CLAN::getFactionIndex(PVP_CLAN::Marauder))>= 100*kFameMultipler) - { - fx.Aura = MAGICFX::TeleportMarauder; - } else { fx.Aura = MAGICFX::NoAura;