More Hooker perrmission changes (#2019)

ACEmulator · Jun 19, 2019 · 860c56c · 860c56c
1 parent 79ed11d
commit 860c56c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Source/ACE.Server/WorldObjects/Hooker.cs b/Source/ACE.Server/WorldObjects/Hooker.cs
@@ -46,6 +46,17 @@ public override ActivationResult CheckUseRequirements(WorldObject activator)
             else if (Owner == null)
                 return new ActivationResult(false);
 
+            var wo = Owner.TryGetWorldObject();
+
+            if (wo == null)
+                return new ActivationResult(false);
+
+            if (!(wo is Hook hook))
+                return new ActivationResult(false);
+
+            if (!hook.HouseOwner.HasValue || hook.HouseOwner.Value == 0 || (!hook.House.OpenStatus && !hook.House.HasPermission(player)))
+                return new ActivationResult(new GameEventWeenieError(player.Session, WeenieError.YouAreNotPermittedToUseThatHook));
+
             var baseRequirements = base.CheckUseRequirements(activator);
             if (!baseRequirements.Success)
                 return baseRequirements;

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # ACEmulator Change Log
 
+### 2019-06-18
+[Ripley]
+* Prevent using Hookers if house isn't owned or is closed and player isn't on guestlist.
+
 ### 2019-06-17
 [Ripley]
 * Prevent using Hookers if they aren't hooked.