Skip to content

Commit a9fdbb4

Browse files
authored
Merge pull request #30 from Panda291/main
general randomizer bugfixes
2 parents 8d98c1d + 1235a59 commit a9fdbb4

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Lawrence/mods/randomizer/Lobby.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,14 @@ function Lobby:Leave(player)
122122
self.host = self.players[1]
123123
self.host:ToastMessage("You are now the host.", 300)
124124
else
125-
self.universe.ap_client.running = false
126-
self.universe.ap_client.ap = nil
125+
self.universe.ap_client_initialized = false
126+
if self.universe.ap_client ~= nil then
127+
if self.universe.ap_client.ap ~= nil then
128+
self.universe.ap_client.ap = nil
129+
end
130+
self.universe.ap_client.running = false
131+
self.universe.ap_client = nil
132+
end
127133
collectgarbage("collect")
128134
lobbyUniverse:RemoveLobby(self)
129135
end

Lawrence/mods/randomizer/LobbyListView.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ end
101101

102102
function LobbyListView:SelectedLobby(lobby)
103103
self.textArea.Text = "Host: " .. lobby.host:Username()
104-
self.gamemodeTextArea.Text = "Friendly fire: " .. (lobby.options.friendlyFire and "On" or "Off")
105104
end
106105

107106
function LobbyListView:OnControllerInputPressed(input)

Lawrence/mods/randomizer/RandoUniverse.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function RandoUniverse:DistributeGiveItem(item_id)
8989
end
9090

9191
if Item.GetById(item_id).isWeapon and item_id ~= 0x0e and item_id ~= 0x12 and item_id ~= 0x09 and item_id ~= 0x15 then -- is weapon that uses ammo
92-
if #self.buyable_weapons == 1 then
92+
if #self.buyable_ammo == 0 then
9393
table.insert(self.buyable_ammo, item_id)
9494
self:DistributeVendorContents()
9595
else

0 commit comments

Comments
 (0)