Fixed the indexoutofboundsexception
Merge pull request #44 from MagiciansArtificeTeam/dev

Fixed the indexoutofboundsexception