According to court documents reviewed by PEOPLE, Depp and Gregg "Rocky" Brooks, a location manager who worked on set with the actor, reached a settlement just weeks before they were set to go to a civil trial in Los Angeles on July 25.
Because Depp, 59, and Brooks settled the suit Monday, judge Holly J. Fujie agreed to put off the upcoming trial until Jan. 5 next year. Though the filing did not publicly reveal the specific things Depp must do in order to fulfill his end of the agreement, if he complies, the case will be dismissed.
PEOPLE has reached out to Brooks' attorney and Depp's reps for comment.
The altercation between Depp and Brooks allegedly occurred on April 13, 2017.
In court documents obtained by PEOPLE in July 2018, Brooks claimed the actor became angry when Brooks told him they only had one more shot while filming a scene in City of Lies, and Brooks sought out an LAPD officer for protection.
Brooks said in the complaint that Depp followed him and allegedly punched him twice in the ribs after screaming, "Who the f— are you? You have no right to tell me what to do."
Brooks then alleged in the complaint that Depp said he'd give him "$100,000 to punch me in the face right now" after Brooks didn't react to the punches. The location manager claimed Depp was eventually removed from the set by his bodyguards.
RELATED VIDEO: Johnny Depp Wins Defamation Case Against Amber Heard, Awarded $15 Million in Damages
The jury awarded Depp with $15 million in damages but Heard will only have to pay $10.35 million due to a cap on punitive damages in Virginia (the judge reduced the amount).
Never miss a story — sign up for PEOPLE's free daily newsletter to stay up-to-date on the best of what PEOPLE has to offer, from juicy celebrity news to compelling human interest stories.
In regards to Heard's countersuit brought against Depp, he was found to have defamed her on one of three claims. She was awarded $2 million in damages.