Desert Oasis fixes

maps/desert_oasis.lua

@@ -438,6 +438,8 @@ local function deny_building(event)
             if type_whitelist[entity.ghost_name] then
                 return
             end
+        else
+            return
         end
     end
 
@@ -533,6 +535,9 @@ local function on_player_changed_position(event)
     if player.vehicle then
         return
     end
+    if script.active_mods['space-age'] and player.cargo_pod then
+        return
+    end
 
     if safe_tiles[surface.get_tile(player.physical_position.x, player.physical_position.y).name] then
         return

modules/thirst.lua

@@ -87,7 +87,7 @@ local function sip(player)
     end
     local water_tiles = player.surface.count_tiles_filtered({
         name = { 'water', 'deepwater', 'water-mud', 'water-shallow' },
-        area = { { player.position.x - 1, player.position.y - 1 }, { player.position.x + 1, player.position.y + 1 } }
+        area = { { player.physical_position.x - 1, player.physical_position.y - 1 }, { player.physical_position.x + 1, player.physical_position.y + 1 } }
     })
     if water_tiles > 0 then
         this.hydration[player.index] = this.hydration[player.index] + 200