From 6842d81053cee6311e08acf1be17eed55a7c395c Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 29 Oct 2015 02:23:57 -0300
Subject: [PATCH] Apply permissions mask after resolving.

---
 src/Discord.Net/Models/User.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index 4f53cdc07..29f99eb93 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -319,8 +319,11 @@ namespace Discord
 					newPermissions |= allowUser.Allow.RawValue;
 			}
 
-            if (BitHelper.GetBit(newPermissions, (int)PermissionsBits.ManageRolesOrPermissions))
+			var mask = ChannelPermissions.All(channel).RawValue;
+			if (BitHelper.GetBit(newPermissions, (int)PermissionsBits.ManageRolesOrPermissions))
 				newPermissions = ChannelPermissions.All(channel).RawValue;
+			else
+				newPermissions &= mask;
 
 			if (newPermissions != oldPermissions)
 			{