Solve same conflicts with eressea/server manuale

scripts/tests/e3a.lua

@@ -283,6 +283,7 @@ function test_market()
   for i = 0, 5 do
     local rn = r:next(i)
   end
+  b.working = true
   eressea.process.markets()
   u:add_item("money", -u:get_item("money")) -- now we only have herbs
   local len = 0
@@ -729,6 +730,6 @@ function test_building_owner_can_enter_ship()
   u2:add_item("money", u1.number * 100)    
   u2:clear_orders()    
   process_orders()
-  assert_equal(s1.id, u1.ship.id)
-  assert_not_equal(b1.id, u1.ship.id, "BUG owner of the building can not go into a ship")
+  assert_equal(s1, u1.ship)
+  assert_equal(null, u1.building, "owner of the building can not go into a ship")
 end

scripts/tests/eressea.lua

@@ -358,4 +358,3 @@ function test_only_building_owner_can_set_not_paid()
   process_orders()
   assert_equal(0, u1:get_item("money"))
 end
-