# HG changeset patch # User unc0rr # Date 1403547749 -14400 # Node ID 05a5762ab12cb2dbab4cea633a2bc8d19e423d42 # Parent 3edfa6b68407fa73d77b11f2d694f0cf30bcc765 Allow server admins to join room of another protocol version diff -r 3edfa6b68407 -r 05a5762ab12c gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Thu Jun 19 23:32:11 2014 +0400 +++ b/gameServer/HWProtoLobbyState.hs Mon Jun 23 22:22:29 2014 +0400 @@ -64,7 +64,7 @@ return $ if isNothing maybeRI then [Warning $ loc "No such room"] - else if not sameProto then + else if (not sameProto) && (not $ isAdministrator cl) then [Warning $ loc "Room version incompatible to your hedgewars version"] else if isRestrictedJoins jRoom then [Warning $ loc "Joining restricted"]