diff --git a/docs/src/highlevel-design/combat/combat.md b/docs/src/highlevel-design/combat/combat.md
new file mode 100644
index 00000000..5d5f02d2
--- /dev/null
+++ b/docs/src/highlevel-design/combat/combat.md
@@ -0,0 +1,5 @@
+@page combat Combat
+
+
+consider: Unlock new animations after training in game engine
+
diff --git a/docs/src/highlevel-design/highleveldesignindex.md b/docs/src/highlevel-design/highleveldesignindex.md
index 1f2c633c..94f3c2e1 100644
--- a/docs/src/highlevel-design/highleveldesignindex.md
+++ b/docs/src/highlevel-design/highleveldesignindex.md
@@ -22,4 +22,5 @@ Discussion of, at a high game-design level, how everything should work and conne
 - @subpage economicsindex
 - @subpage structuresandbuildings
 - @subpage dungeonsindex
-- @subpage controlDesign
\ No newline at end of file
+- @subpage controlDesign
+- @subpage combat
\ No newline at end of file
diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index 6f3f8001..9d612f89 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1316,6 +1316,12 @@ Single block model custom shader
 Data-defined actor per-mesh uniform overrides
 Proper textures on each block item
 
+(03/06/2025)
+Fix bugs with block chunks not being marked as non-homogenous after editing
+
+(03/24/2025)
+Fix entity swap button resetting position
+
 
 
 # TODO
@@ -1347,6 +1353,7 @@ Floating world origin
  - Separately simulated regions of physics that dynamically merge/unmerge based on chunk loading
 
 Bug Fixes
+ - Server not regenerating physics entities correctly after block edit
  - Fix hitbox placement does not scale with entity scale on server
  - Calculate bounding sphere for meshes by deforming vertices with bone default pose instead of no bone deform
  - Fix light cluster mapping for foliage shader
diff --git a/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java b/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java
index 990c2239..fbf2f430 100644
--- a/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java
+++ b/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java
@@ -107,6 +107,7 @@ public class CharacterProtocol implements ServerProtocolTemplate<CharacterMessag
     /**
      * Spawns the player's entity
      * @param connectionHandler The connection handler for the player
+     * @param id The id in the db to lookup the template from
      * @return THe player's entity
      */
     static Entity spawnEntityForClient(ServerConnectionHandler connectionHandler, int id){
@@ -196,6 +197,7 @@ public class CharacterProtocol implements ServerProtocolTemplate<CharacterMessag
         Player player = connectionHandler.getPlayer();
         Entity playerEntity = player.getPlayerEntity();
         Vector3d position = EntityUtils.getPosition(playerEntity);
+        Globals.realmManager.getEntityRealm(playerEntity).registerSpawnPoint(position);;
         Globals.realmManager.getEntityRealm(playerEntity).getSpawnPoint().set(position);
         ServerEntityUtils.destroyEntity(playerEntity);