Format stuff
Merge remote-tracking branch 'connor/Saros2' into saros2

Conflicts:
	NoxCore/src/main/java/com/noxpvp/core/utils/PlayerUtils.java
Repair Merge Errors plus more.
a
Merge remote-tracking branch 'connor/Saros2' into saros2

Conflicts:
	NoxCore/src/main/java/com/noxpvp/core/utils/PlayerUtils.java
Sync
Added some test Fixes
Fixes