Gingerbeard Pickup Crash Fix

Added Gingerbeard's pick menu crash fix (transhumandesign/kag-base#2145)
mehwaffle10 · Nov 20, 2024 · ff7155c · ff7155c
1 parent 78747e8
commit ff7155c
Show file tree

Hide file tree

Showing 3 changed files with 707 additions and 4 deletions.
diff --git a/Base/Entities/Common/Controls/StandardControls.as b/Base/Entities/Common/Controls/StandardControls.as
@@ -10,9 +10,6 @@ int zoomLevel = 1; // we can declare a global because this script is just used b
 void onInit(CBlob@ this)
 {
 	this.set_s32("tap_time", getGameTime());
-	CBlob@[] blobs;
-	this.set("pickup blobs", blobs);
-	this.set_u16("hover netid", 0);
 	this.set_bool("release click", false);
 	this.set_bool("can button tap", true);
 	this.addCommandID("pickup");
@@ -73,7 +70,7 @@ void onCommand(CBlob@ this, u8 cmd, CBitStream @params)
 		if (pickedup is null) return;
 
 		if (!pickedup.canBePickedUp(caller)) return;
-
+		
 		if (pickedup.isAttached()) return;
 
         // Waffle: Add distance check
@@ -83,6 +80,7 @@ void onCommand(CBlob@ this, u8 cmd, CBitStream @params)
             return;
         }
 
+		pickedup.setPosition(caller.getPosition());
 		caller.server_Pickup(pickedup);
 	}
 	else if (cmd == this.getCommandID("detach"))