Skip to content

Fix multiplayer capacity resets on clients #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
user01010111 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix multiplayer capacity resets on clients #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 44 additions & 45 deletions scripts/events/RmStorageCapacitySyncEvent.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,15 @@ end
---@param placeable table The storage placeable object
---@param fillTypeIndex number Fill type index (-1 for HusbandryFood)
---@param appliedCapacity number The capacity that was applied
function RmStorageCapacitySyncEvent.newServerToClient(errorCode, placeable, fillTypeIndex, appliedCapacity)
---@param actionType number ACTION_SET_CAPACITY or ACTION_RESET_CAPACITY
function RmStorageCapacitySyncEvent.newServerToClient(errorCode, placeable, fillTypeIndex, appliedCapacity, actionType)
local self = RmStorageCapacitySyncEvent.emptyNew()

self.errorCode = errorCode or RmStorageCapacitySyncEvent.ERROR_UNKNOWN
self.placeable = placeable
self.fillTypeIndex = fillTypeIndex or 0
self.appliedCapacity = appliedCapacity or 0
self.actionType = actionType or RmStorageCapacitySyncEvent.ACTION_SET_CAPACITY
self.isResponse = true

return self
Expand All @@ -83,6 +85,7 @@ function RmStorageCapacitySyncEvent:readStream(streamId, connection)
self.placeable = NetworkUtil.readNodeObject(streamId)
self.fillTypeIndex = streamReadInt32(streamId)
self.appliedCapacity = streamReadInt32(streamId)
self.actionType = streamReadUIntN(streamId, 2)
self.isResponse = true
end

Expand All @@ -105,6 +108,7 @@ function RmStorageCapacitySyncEvent:writeStream(streamId, connection)
NetworkUtil.writeNodeObject(streamId, self.placeable)
streamWriteInt32(streamId, self.fillTypeIndex or 0)
streamWriteInt32(streamId, self.appliedCapacity or 0)
streamWriteUIntN(streamId, self.actionType or RmStorageCapacitySyncEvent.ACTION_SET_CAPACITY, 2)
end
end

Expand Down Expand Up @@ -198,7 +202,10 @@ function RmStorageCapacitySyncEvent:runOnServer(connection)
if hasPermission then
if self.actionType == RmStorageCapacitySyncEvent.ACTION_RESET_CAPACITY then
-- Reset capacity (convert network sentinel -2 back to nil for "reset all")
local resetIndex = self.fillTypeIndex == RmStorageCapacitySyncEvent.FILL_TYPE_RESET_ALL and nil or self.fillTypeIndex
local resetIndex = self.fillTypeIndex
if resetIndex == RmStorageCapacitySyncEvent.FILL_TYPE_RESET_ALL then
resetIndex = nil
end
local success, err = RmAdjustStorageCapacity:resetCapacity(placeable, resetIndex)
if success then
appliedCapacity = 0 -- Original capacity
Expand Down Expand Up @@ -236,13 +243,13 @@ function RmStorageCapacitySyncEvent:runOnServer(connection)
-- Send response back to requesting client
Log:debug("Server sending response: errorCode=%d, appliedCapacity=%d", errorCode, appliedCapacity)
connection:sendEvent(RmStorageCapacitySyncEvent.newServerToClient(
errorCode, placeable, self.fillTypeIndex, appliedCapacity))
errorCode, placeable, self.fillTypeIndex, appliedCapacity, self.actionType))

-- If successful, broadcast to all OTHER clients
if errorCode == RmStorageCapacitySyncEvent.RESULT_OK then
Log:debug("Broadcasting success to other clients")
g_server:broadcastEvent(RmStorageCapacitySyncEvent.newServerToClient(
errorCode, placeable, self.fillTypeIndex, appliedCapacity), false, connection)
errorCode, placeable, self.fillTypeIndex, appliedCapacity, self.actionType), false, connection)
end
end

Expand All @@ -257,56 +264,45 @@ function RmStorageCapacitySyncEvent:runOnClient()
if self.errorCode == RmStorageCapacitySyncEvent.RESULT_OK then
-- Update local state
if placeable ~= nil then
local uniqueId = placeable.uniqueId
local success
local err

if uniqueId == nil then
Log:warning("Client: Placeable %s has nil uniqueId", placeableName)
return
end

-- Apply the capacity locally
if self.appliedCapacity > 0 then
if RmAdjustStorageCapacity.customCapacities[uniqueId] == nil then
RmAdjustStorageCapacity.customCapacities[uniqueId] = {
fillTypes = {},
husbandryFood = nil
}
if self.actionType == RmStorageCapacitySyncEvent.ACTION_RESET_CAPACITY then
local resetIndex = self.fillTypeIndex
if resetIndex == RmStorageCapacitySyncEvent.FILL_TYPE_RESET_ALL then
resetIndex = nil
end
success, err = RmAdjustStorageCapacity:resetCapacity(placeable, resetIndex)
else
success, err = RmAdjustStorageCapacity:setCapacity(
placeable, self.fillTypeIndex, self.appliedCapacity)
end

-- Handle special cases: -1 = HusbandryFood, 0 = shared capacity
if self.fillTypeIndex == -1 then
RmAdjustStorageCapacity.customCapacities[uniqueId].husbandryFood = self.appliedCapacity
local customCapacity = {husbandryFood = self.appliedCapacity}
RmAdjustStorageCapacity:applyCapacitiesToPlaceable(placeable, customCapacity)
elseif self.fillTypeIndex == 0 then
-- Shared capacity (fillType 0 is sentinel for shared)
RmAdjustStorageCapacity.customCapacities[uniqueId].sharedCapacity = self.appliedCapacity
local customCapacity = {sharedCapacity = self.appliedCapacity}
RmAdjustStorageCapacity:applyCapacitiesToPlaceable(placeable, customCapacity)
else
-- Per-fillType capacity
if RmAdjustStorageCapacity.customCapacities[uniqueId].fillTypes == nil then
RmAdjustStorageCapacity.customCapacities[uniqueId].fillTypes = {}
end
RmAdjustStorageCapacity.customCapacities[uniqueId].fillTypes[self.fillTypeIndex] = self.appliedCapacity
local customCapacity = {fillTypes = {[self.fillTypeIndex] = self.appliedCapacity}}
RmAdjustStorageCapacity:applyCapacitiesToPlaceable(placeable, customCapacity)
end
if not success then
Log:warning("Client could not apply capacity update for %s: %s",
placeableName, err or "unknown")
return
end

Log:debug("MP: Updated local capacity for %s fillType=%d to %d",
placeableName, self.fillTypeIndex, self.appliedCapacity)

-- Show success message
local fillTypeName
if self.fillTypeIndex == -1 then
fillTypeName = g_i18n:getText("rm_asc_husbandryFood") or "Animal Food"
if self.actionType == RmStorageCapacitySyncEvent.ACTION_RESET_CAPACITY then
g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
g_i18n:getText("rm_asc_status_reset"))
else
local fillType = g_fillTypeManager:getFillTypeByIndex(self.fillTypeIndex)
fillTypeName = fillType and fillType.title or "Unknown"
local fillTypeName
if self.fillTypeIndex == -1 then
fillTypeName = g_i18n:getText("rm_asc_husbandryFood") or "Animal Food"
else
local fillType = g_fillTypeManager:getFillTypeByIndex(self.fillTypeIndex)
fillTypeName = fillType and fillType.title or "Unknown"
end
g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
string.format(g_i18n:getText("rm_asc_mp_success"),
placeableName, fillTypeName, self.appliedCapacity))
end
g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
string.format(g_i18n:getText("rm_asc_mp_success"), placeableName, fillTypeName, self.appliedCapacity))
else
Log:warning("Client: Placeable not found in response")
end
Expand Down Expand Up @@ -384,7 +380,8 @@ function RmStorageCapacitySyncEvent.sendSetCapacity(placeable, fillTypeIndex, ne
-- Broadcast to clients if MP
if isMultiplayer then
g_server:broadcastEvent(RmStorageCapacitySyncEvent.newServerToClient(
RmStorageCapacitySyncEvent.RESULT_OK, placeable, fillTypeIndex, newCapacity))
RmStorageCapacitySyncEvent.RESULT_OK, placeable, fillTypeIndex, newCapacity,
RmStorageCapacitySyncEvent.ACTION_SET_CAPACITY))
end

local fillTypeName
Expand Down Expand Up @@ -441,7 +438,9 @@ function RmStorageCapacitySyncEvent.sendResetCapacity(placeable, fillTypeIndex)
-- Broadcast to clients if MP
if isMultiplayer then
g_server:broadcastEvent(RmStorageCapacitySyncEvent.newServerToClient(
RmStorageCapacitySyncEvent.RESULT_OK, placeable, fillTypeIndex or RmStorageCapacitySyncEvent.FILL_TYPE_RESET_ALL, 0))
RmStorageCapacitySyncEvent.RESULT_OK, placeable,
fillTypeIndex or RmStorageCapacitySyncEvent.FILL_TYPE_RESET_ALL, 0,
RmStorageCapacitySyncEvent.ACTION_RESET_CAPACITY))
end

g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
Expand Down
60 changes: 31 additions & 29 deletions scripts/events/RmVehicleCapacitySyncEvent.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ end
---@param vehicle table The vehicle object
---@param fillUnitIndex number Fill unit index
---@param appliedCapacity number The capacity that was applied
function RmVehicleCapacitySyncEvent.newServerToClient(errorCode, vehicle, fillUnitIndex, appliedCapacity)
---@param actionType number ACTION_SET_CAPACITY or ACTION_RESET_CAPACITY
function RmVehicleCapacitySyncEvent.newServerToClient(errorCode, vehicle, fillUnitIndex, appliedCapacity, actionType)
local self = RmVehicleCapacitySyncEvent.emptyNew()

self.errorCode = errorCode or RmVehicleCapacitySyncEvent.ERROR_UNKNOWN
self.vehicle = vehicle
self.fillUnitIndex = fillUnitIndex or 1
self.appliedCapacity = appliedCapacity or 0
self.actionType = actionType or RmVehicleCapacitySyncEvent.ACTION_SET_CAPACITY
self.isResponse = true

return self
Expand All @@ -80,6 +82,7 @@ function RmVehicleCapacitySyncEvent:readStream(streamId, connection)
self.vehicle = NetworkUtil.readNodeObject(streamId)
self.fillUnitIndex = streamReadInt32(streamId)
self.appliedCapacity = streamReadInt32(streamId)
self.actionType = streamReadUIntN(streamId, 2)
self.isResponse = true
end

Expand All @@ -102,6 +105,7 @@ function RmVehicleCapacitySyncEvent:writeStream(streamId, connection)
NetworkUtil.writeNodeObject(streamId, self.vehicle)
streamWriteInt32(streamId, self.fillUnitIndex or 1)
streamWriteInt32(streamId, self.appliedCapacity or 0)
streamWriteUIntN(streamId, self.actionType or RmVehicleCapacitySyncEvent.ACTION_SET_CAPACITY, 2)
end
end

Expand Down Expand Up @@ -232,13 +236,13 @@ function RmVehicleCapacitySyncEvent:runOnServer(connection)
-- Send response back to requesting client
Log:debug("Server sending response: errorCode=%d, appliedCapacity=%d", errorCode, appliedCapacity)
connection:sendEvent(RmVehicleCapacitySyncEvent.newServerToClient(
errorCode, vehicle, self.fillUnitIndex, appliedCapacity))
errorCode, vehicle, self.fillUnitIndex, appliedCapacity, self.actionType))

-- If successful, broadcast to all OTHER clients
if errorCode == RmVehicleCapacitySyncEvent.RESULT_OK then
Log:debug("Broadcasting success to other clients")
g_server:broadcastEvent(RmVehicleCapacitySyncEvent.newServerToClient(
errorCode, vehicle, self.fillUnitIndex, appliedCapacity), false, connection)
errorCode, vehicle, self.fillUnitIndex, appliedCapacity, self.actionType), false, connection)
end
end

Expand All @@ -253,39 +257,35 @@ function RmVehicleCapacitySyncEvent:runOnClient()
if self.errorCode == RmVehicleCapacitySyncEvent.RESULT_OK then
-- Update local state
if vehicle ~= nil then
local uniqueId = vehicle.uniqueId
local success
local err

if uniqueId == nil then
Log:warning("Client: Vehicle %s has nil uniqueId", vehicleName)
return
if self.actionType == RmVehicleCapacitySyncEvent.ACTION_RESET_CAPACITY then
local resetIndex = self.fillUnitIndex > 0 and self.fillUnitIndex or nil
success, err = RmAdjustStorageCapacity:resetVehicleCapacity(vehicle, resetIndex)
else
success, err = RmAdjustStorageCapacity:setVehicleCapacity(
vehicle, self.fillUnitIndex, self.appliedCapacity)
end

-- Apply the capacity locally
if self.appliedCapacity > 0 then
if RmAdjustStorageCapacity.vehicleCapacities[uniqueId] == nil then
RmAdjustStorageCapacity.vehicleCapacities[uniqueId] = {}
end

RmAdjustStorageCapacity.vehicleCapacities[uniqueId][self.fillUnitIndex] = self.appliedCapacity
RmAdjustStorageCapacity:applyVehicleCapacities(vehicle)
else
-- Reset - remove the entry
if RmAdjustStorageCapacity.vehicleCapacities[uniqueId] ~= nil then
RmAdjustStorageCapacity.vehicleCapacities[uniqueId][self.fillUnitIndex] = nil
-- Clean up empty entry
if next(RmAdjustStorageCapacity.vehicleCapacities[uniqueId]) == nil then
RmAdjustStorageCapacity.vehicleCapacities[uniqueId] = nil
end
end
RmAdjustStorageCapacity:applyVehicleCapacities(vehicle)
if not success then
Log:warning("Client could not apply capacity update for %s: %s",
vehicleName, err or "unknown")
return
end

Log:debug("MP: Updated local capacity for %s fillUnit=%d to %d",
vehicleName, self.fillUnitIndex, self.appliedCapacity)

-- Show success message
g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
string.format(g_i18n:getText("rm_asc_vehicle_capacitySet"), vehicleName, self.appliedCapacity))
if self.actionType == RmVehicleCapacitySyncEvent.ACTION_RESET_CAPACITY then
g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
g_i18n:getText("rm_asc_status_reset"))
else
g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
string.format(g_i18n:getText("rm_asc_vehicle_capacitySet"),
vehicleName, self.appliedCapacity))
end
else
Log:warning("Client: Vehicle not found in response")
end
Expand Down Expand Up @@ -363,7 +363,8 @@ function RmVehicleCapacitySyncEvent.sendSetCapacity(vehicle, fillUnitIndex, newC
-- Broadcast to clients if MP
if isMultiplayer then
g_server:broadcastEvent(RmVehicleCapacitySyncEvent.newServerToClient(
RmVehicleCapacitySyncEvent.RESULT_OK, vehicle, fillUnitIndex, newCapacity))
RmVehicleCapacitySyncEvent.RESULT_OK, vehicle, fillUnitIndex, newCapacity,
RmVehicleCapacitySyncEvent.ACTION_SET_CAPACITY))
end

local messageKey
Expand Down Expand Up @@ -413,7 +414,8 @@ function RmVehicleCapacitySyncEvent.sendResetCapacity(vehicle, fillUnitIndex)
-- Broadcast to clients if MP
if isMultiplayer then
g_server:broadcastEvent(RmVehicleCapacitySyncEvent.newServerToClient(
RmVehicleCapacitySyncEvent.RESULT_OK, vehicle, fillUnitIndex or 0, 0))
RmVehicleCapacitySyncEvent.RESULT_OK, vehicle, fillUnitIndex or 0, 0,
RmVehicleCapacitySyncEvent.ACTION_RESET_CAPACITY))
end

g_currentMission:addIngameNotification(FSBaseMission.INGAME_NOTIFICATION_OK,
Expand Down