Added null reference check to ClientInputSender script

Elfi0Kuhndorf · Elfi0Kuhndorf · commit 620c6e32359f · 2024-02-29T13:53:58.000+01:00
diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
@@ -473,27 +473,28 @@ public void RequestAction(ActionID actionID, SkillTriggerStyle triggerStyle, ulo
 
         void Update()
         {
-            if (Input.GetKeyDown(KeyCode.Alpha1))
+            if (Input.GetKeyDown(KeyCode.Alpha1) && CharacterClass.Skill1)
             {
+                
                 RequestAction(actionState1.actionID, SkillTriggerStyle.Keyboard);
             }
-            else if (Input.GetKeyUp(KeyCode.Alpha1))
+            else if (Input.GetKeyUp(KeyCode.Alpha1) && CharacterClass.Skill1)
             {
                 RequestAction(actionState1.actionID, SkillTriggerStyle.KeyboardRelease);
             }
-            if (Input.GetKeyDown(KeyCode.Alpha2))
+            if (Input.GetKeyDown(KeyCode.Alpha2) && CharacterClass.Skill2)
             {
                 RequestAction(actionState2.actionID, SkillTriggerStyle.Keyboard);
             }
-            else if (Input.GetKeyUp(KeyCode.Alpha2))
+            else if (Input.GetKeyUp(KeyCode.Alpha2) && CharacterClass.Skill2)
             {
                 RequestAction(actionState2.actionID, SkillTriggerStyle.KeyboardRelease);
             }
-            if (Input.GetKeyDown(KeyCode.Alpha3))
+            if (Input.GetKeyDown(KeyCode.Alpha3) && CharacterClass.Skill3)
             {
                 RequestAction(actionState3.actionID, SkillTriggerStyle.Keyboard);
             }
-            else if (Input.GetKeyUp(KeyCode.Alpha3))
+            else if (Input.GetKeyUp(KeyCode.Alpha3) && CharacterClass.Skill3)
             {
                 RequestAction(actionState3.actionID, SkillTriggerStyle.KeyboardRelease);
             }

Original file line number	Diff line number	Diff line change
`@@ -473,27 +473,28 @@ public void RequestAction(ActionID actionID, SkillTriggerStyle triggerStyle, ulo`
`473`	`473`
`474`	`474`	`void Update()`
`475`	`475`	`{`
`476`		`- if (Input.GetKeyDown(KeyCode.Alpha1))`
	`476`	`+ if (Input.GetKeyDown(KeyCode.Alpha1) && CharacterClass.Skill1)`
`477`	`477`	`{`
	`478`	`+`
`478`	`479`	`RequestAction(actionState1.actionID, SkillTriggerStyle.Keyboard);`
`479`	`480`	`}`
`480`		`- else if (Input.GetKeyUp(KeyCode.Alpha1))`
	`481`	`+ else if (Input.GetKeyUp(KeyCode.Alpha1) && CharacterClass.Skill1)`
`481`	`482`	`{`
`482`	`483`	`RequestAction(actionState1.actionID, SkillTriggerStyle.KeyboardRelease);`
`483`	`484`	`}`
`484`		`- if (Input.GetKeyDown(KeyCode.Alpha2))`
	`485`	`+ if (Input.GetKeyDown(KeyCode.Alpha2) && CharacterClass.Skill2)`
`485`	`486`	`{`
`486`	`487`	`RequestAction(actionState2.actionID, SkillTriggerStyle.Keyboard);`
`487`	`488`	`}`
`488`		`- else if (Input.GetKeyUp(KeyCode.Alpha2))`
	`489`	`+ else if (Input.GetKeyUp(KeyCode.Alpha2) && CharacterClass.Skill2)`
`489`	`490`	`{`
`490`	`491`	`RequestAction(actionState2.actionID, SkillTriggerStyle.KeyboardRelease);`
`491`	`492`	`}`
`492`		`- if (Input.GetKeyDown(KeyCode.Alpha3))`
	`493`	`+ if (Input.GetKeyDown(KeyCode.Alpha3) && CharacterClass.Skill3)`
`493`	`494`	`{`
`494`	`495`	`RequestAction(actionState3.actionID, SkillTriggerStyle.Keyboard);`
`495`	`496`	`}`
`496`		`- else if (Input.GetKeyUp(KeyCode.Alpha3))`
	`497`	`+ else if (Input.GetKeyUp(KeyCode.Alpha3) && CharacterClass.Skill3)`
`497`	`498`	`{`
`498`	`499`	`RequestAction(actionState3.actionID, SkillTriggerStyle.KeyboardRelease);`
`499`	`500`	`}`