improve rpc stuff

g0aty · Feb 27, 2024 · e13a547 · e13a547
1 parent 4362067
commit e13a547
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rpc/RpcSetColor.cpp b/rpc/RpcSetColor.cpp
@@ -25,13 +25,13 @@ RpcForceColor::RpcForceColor(PlayerControl* player, uint8_t bodyColor)
 void RpcForceColor::Process()
 {
 	if (!PlayerSelection(Player).has_value()) return;
-
-	//PlayerControl_RpcSetColor(Player, bodyColor, NULL);
 
 	for (auto p : GetAllPlayerControl()) {
 		auto writer = InnerNetClient_StartRpcImmediately((InnerNetClient*)(*Game::pAmongUsClient), Player->fields._.NetId,
 			uint8_t(RpcCalls__Enum::SetColor), SendOption__Enum::None, p->fields._.OwnerId, NULL);
 		MessageWriter_WriteByte(writer, uint8_t(bodyColor), NULL);
 		InnerNetClient_FinishRpcImmediately((InnerNetClient*)(*Game::pAmongUsClient), writer, NULL);
 	}
+
+	PlayerControl_RpcSetColor(Player, bodyColor, NULL);
 }
diff --git a/rpc/RpcSnapTo.cpp b/rpc/RpcSnapTo.cpp
@@ -22,7 +22,6 @@ void RpcForceSnapTo::Process()
 {
 	if (!PlayerSelection(Player).has_value()) return;
 
-	//CustomNetworkTransform_RpcSnapTo((Player)->fields.NetTransform, targetVector, NULL);
 	CustomNetworkTransform_SnapTo(Player->fields.NetTransform, targetVector, Player->fields.NetTransform->fields.lastSequenceId + 100, NULL);
 	for (auto p : GetAllPlayerControl()) {
 		if (p == *Game::pLocalPlayer) continue;
@@ -33,4 +32,6 @@ void RpcForceSnapTo::Process()
 		InnerNetClient_FinishRpcImmediately((InnerNetClient*)(*Game::pAmongUsClient), writer, NULL);
 	}
 	Player->fields.NetTransform->fields.lastSequenceId += 100;
+
+	CustomNetworkTransform_RpcSnapTo((Player)->fields.NetTransform, targetVector, NULL);
 }