BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dash fix?

Browse Source
This commit is contained in:
viktorljung
2016-03-13 20:46:59 +01:00
parent 1da3ec3c74
commit ee8d7574b2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/PlayerMovementSystem.cpp
+8 -3
View File
@@ -392,17 +392,22 @@ void PlayerMovementSystem::spawnHexagon(EntityWrapper target)
bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e) bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e)
{ {
EntityWrapper player(m_World, e.Player); EntityWrapper eventPlayer(m_World, e.Player);
if (!player.Valid() || !IsClient || player.ID == LocalPlayer.ID) { if (!eventPlayer.Valid() || IsServer || eventPlayer.ID == LocalPlayer.ID) {
return false; return false;
} }
// auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DashEffect.xml"); // auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DashEffect.xml");
// EntityWrapper dashEffect = entityFile->MergeInto(m_World); // EntityWrapper dashEffect = entityFile->MergeInto(m_World);
EntityWrapper playerModel = player.FirstChildByName("PlayerModel"); EntityWrapper playerModel = eventPlayer.FirstChildByName("PlayerModel");
for (auto& kv : m_PlayerInputControllers) { for (auto& kv : m_PlayerInputControllers) {
EntityWrapper player = kv.first; EntityWrapper player = kv.first;
if(player != eventPlayer) {
continue;
}
auto& controller = kv.second; auto& controller = kv.second;
if (!player.Valid()) { if (!player.Valid()) {