mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-05-28 20:27:46 +00:00
merge failed
This commit is contained in:
parent
0513025b6a
commit
5867224baf
1 changed files with 0 additions and 2 deletions
|
@ -129,8 +129,6 @@ namespace Sapphire::World::Action
|
||||||
ActionEntry getActionEntry() const;
|
ActionEntry getActionEntry() const;
|
||||||
float getAnimationLock();
|
float getAnimationLock();
|
||||||
|
|
||||||
float getAnimationLock();
|
|
||||||
|
|
||||||
bool isPhysical() const;
|
bool isPhysical() const;
|
||||||
bool isMagical() const;
|
bool isMagical() const;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue