Merge pull request #572 from Slayer95/master

Fix Quick Guard not blocking friendly fire
Update Endless Battle Clause
Fix crash in 42b9ad