Cleanup final CombatTracker diff

Author: lynxplay

paper-server/patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch

@@ -34,15 +34,8 @@
 +        }
 +    }
 +
-+    public void resetCombatState() {
++    public void resetCombatState() {{
 +    // Paper end - Combat tracker API
              boolean wasInCombat = this.inCombat;
              this.takingDamage = false;
              this.inCombat = false;
-@@ -156,6 +_,5 @@
-             }
- 
-             this.entries.clear();
--        }
-     }
- }