1.8.13 - improved owner/master checks

added OnOwnershipRequest overrides to both the Master script and the videoplayer script changed how checking is done when trying to change a url from a flat owner check, to a master/owner check depending what mode the player is in.
UdonVR · Aug 1, 2021 · f087859 · f087859
1 parent 1cb427a
commit f087859
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/MasterOnly.cs b/MasterOnly.cs
@@ -31,6 +31,20 @@ private void Start()
 
         }
 
+        public override bool OnOwnershipRequest(VRCPlayerApi requestingPlayer, VRCPlayerApi requestedOwner)
+        {
+            if (syncedMasterOnly)
+            {
+                if (requestedOwner.isMaster) return false;
+                if (requestingPlayer.isMaster) return true;
+            }
+            else
+            {
+                return true;
+            }
+            return false;
+        }
+
         public void MasterToggleButton() //Call RunProgram on this method
         {
             Debug.Log("[UdonVR] MasterToggle!");

diff --git a/UdonSyncVideoPlayer.cs b/UdonSyncVideoPlayer.cs
@@ -123,6 +123,19 @@ private void Start()
         {
         }
 
+        public override bool OnOwnershipRequest(VRCPlayerApi requestingPlayer, VRCPlayerApi requestedOwner)
+        {
+            if (MasterOnlyScript.syncedMasterOnly)
+            {
+                if (requestedOwner.isMaster) return false;
+                if (requestingPlayer.isMaster) return true;
+            } else
+            {
+                return true;
+            }
+            return false;
+        }
+
         public void Init()
         {
             if (Networking.LocalPlayer != null)
@@ -227,11 +240,24 @@ private void SetVideoModeVRCUnity()
 
         public void ChangeVideoUrlVRC(VRCUrl url)
         {
-            if (!Networking.IsOwner(gameObject)) return;
-            if (url.Get() != "" && url != _syncedURL)
+            if (MasterOnlyScript.syncedMasterOnly)
+            {
+                if (Networking.IsMaster && Networking.IsOwner(gameObject))
+                {
+                    if (url.Get() != "" && url != _syncedURL)
+                    {
+                        _syncedURL = url;
+                        ChangeVideoUrl();
+                    }
+                }
+            } else
             {
-                _syncedURL = url;
-                ChangeVideoUrl();
+                if (!Networking.IsOwner(gameObject)) return;
+                if (url.Get() != "" && url != _syncedURL)
+                {
+                    _syncedURL = url;
+                    ChangeVideoUrl();
+                }
             }
         }