Fixed some grave-tracking inconsistencies.

twohoursonelife · Aug 13, 2023 · e621b6a · e621b6a
1 parent f19a66c
commit e621b6a
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/server/server.cpp b/server/server.cpp
@@ -5837,7 +5837,13 @@ static void swapHeldWithGround(
     inPlayer->heldTransitionSourceID = -1;
 
 
-    if( gravePlayerID > 0 ) {
+    inPlayer->heldGravePlayerID = 0;
+
+    if( inPlayer->holdingID > 0 &&
+        strstr( getObject( inPlayer->holdingID )->description, 
+                "origGrave" ) != NULL &&
+        gravePlayerID > 0 ) {
+
         inPlayer->heldGraveOriginX = inMapX;
         inPlayer->heldGraveOriginY = inMapY;
         inPlayer->heldGravePlayerID = gravePlayerID;
@@ -9443,14 +9449,23 @@ static void setHeldGraveOrigin( LiveObject *inPlayer, int inX, int inY,
         // make sure that that there was a grave there before
         int gravePlayerID = getGravePlayerID( inX, inY );
 
+        // clear it
+        inPlayer->heldGravePlayerID = 0;
+
+
         if( gravePlayerID > 0 ) {
 
             // player action actually picked up this grave
 
-            inPlayer->heldGraveOriginX = inX;
-            inPlayer->heldGraveOriginY = inY;
-
-            inPlayer->heldGravePlayerID = getGravePlayerID( inX, inY );
+            if( inPlayer->holdingID > 0 &&
+                strstr( getObject( inPlayer->holdingID )->description, 
+                        "origGrave" ) != NULL ) {
+
+                inPlayer->heldGraveOriginX = inX;
+                inPlayer->heldGraveOriginY = inY;
+
+                inPlayer->heldGravePlayerID = getGravePlayerID( inX, inY );
+                }
 
             // clear it from ground
             setGravePlayerID( inX, inY, 0 );