Some fixes due to the project being broken.

FairlySadPanda · May 8, 2020 · 75f2aef · 75f2aef
1 parent 01e9d6d
commit 75f2aef
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-.vs
+*.prefab
+*.asset
+*.meta
diff --git a/ChatController.cs b/ChatController.cs
@@ -10,8 +10,8 @@ public class ChatController : UdonSharpBehaviour
 {
     ///<Summary>The text input field for this controller.</Summary>
     public InputField input;
-    ///<Summary>The manager we want to handle chat events.</Summary>
-    public EventEmissionManager manager;
+    ///<Summary>The receiver we want to handle chat events.</Summary>
+    public EventReceiver receiver;
 
     public string[] badWords;
     private int maxMessageLength;
@@ -37,7 +37,7 @@ public void SendMessage()
         string message = input.text;
         if (badWordsFound(message) == false)
         {
-            manager.SendEvent("ChatMessage", message.Replace(",", "|"));
+            receiver.SendEvent("ChatMessage", message.Replace(",", "|"));
         }
 
         input.text = null;

diff --git a/UdonKeyboard/InWorldImmobilizeToggle.cs b/UdonKeyboard/InWorldImmobilizeToggle.cs
@@ -23,7 +23,6 @@ public void PressKey()
             }
 
             Networking.LocalPlayer.Immobilize(true);
-            keyEventListener.Freeze();
             buttonImage.color = Color.blue;
             toggle = true;
         }
@@ -37,7 +36,6 @@ public void Deactivate()
         }
 
         buttonImage.color = Color.white;
-        keyEventListener.Unfreeze();
         toggle = false;
     }
 }
diff --git a/UdonKeyboard/KeyboardManager.cs b/UdonKeyboard/KeyboardManager.cs
@@ -125,7 +125,7 @@ public void Toggle()
 
         if (Networking.LocalPlayer != null && !Networking.LocalPlayer.IsUserInVR())
         {
-            logger.Toggle();
+            logScreen.Toggle();
         }
 
         gameObject.SetActive(!gameObject.activeSelf);

diff --git a/UdonStringEvent/EventHandler.cs b/UdonStringEvent/EventHandler.cs
@@ -18,7 +18,7 @@ public class EventHandler : UdonSharpBehaviour
     public void Handle()
     {
         string[] e = newEvent.Split(',');
-        Debug.Log("Got an event named " + e[0] + " with payload " + newEvent + " - am owner? " + ownerOfGame);
+        Debug.Log("Got an event named " + e[0] + " with payload " + newEvent);
 
         // Event type switch. Contains both state and view events. (Too many synced strings currently will break eventually.)
         // TODO: Replace with a true event bus when network event payloads are added.