AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix being unable to use some commands on hidden players of the same rank, even though you can see them in tab list and an in game entity. (Thanks Joseph)

Browse Source
This commit is contained in:
UnknownShadow200 2016-08-13 19:22:44 +10:00
parent 6a1ade461b
commit 6a9edf1536
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MCGalaxy_.csproj
View File

@ -649,7 +649,6 @@
<ItemGroup>
<None Include="packages.config" />
<None Include="app.config" />
<None Include="bin\Release\Updater.exe" />
<Content Include="Galaxy.ico" />
<Content Include="mcf.sh">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

8
Player/Entities.cs
View File

@ -172,14 +172,14 @@ namespace MCGalaxy {
}
/// <summary> Returns whether the given player is able to see the other player (e.g. in /who). </summary>
/// <summary> Returns whether the given player is able to see the target player (e.g. in /who). </summary>
public static bool CanSee(Player p, Player target) {
if (p == null || !target.hidden || p == target) return true;
if (target.otherRankHidden) return p.Rank >= target.oHideRank;
return p.Rank > target.group.Permission;
return p.Rank >= target.Rank;
}
/// <summary> Returns whether the given player is able to see the other player as an in-game entity. </summary>
/// <summary> Returns whether the given player is able to see the target player as an in-game entity. </summary>
public static bool CanSeeEntity(Player p, Player target) {
bool mayBeHidden = target.hidden;
mayBeHidden |= (target.Game.Referee || target.Game.Invisible) && Server.zombie.Running;
@ -189,7 +189,7 @@ namespace MCGalaxy {
if (target.Game.Invisible && !p.Game.Referee
&& Server.zombie.Running) return false;
if (target.otherRankHidden) return p.Rank >= target.oHideRank;
return p.Rank >= target.group.Permission;
return p.Rank >= target.Rank;
}
/// <summary> Updates the model of the entity with the specified id to all other players. </summary>