Merge branch 'new_features'

4 years ago · e0c4bcf4e0
parent a1d3f91a9b
commit e0c4bcf4e0
1 changed files with 0 additions and 4 deletions
--- 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;