Added a small bit of error checking.

If a player caused player_airborn or player_landed to fire but disconnected or became invalid on the next frame then GetPawn() would error due to pc being nullptr.

TestPlayerJump.py
added cleanup on disconnect to remove a players entries in the last_grounded and players_in_air dicts.

Usage of ADVPlayer.GetName() will either return const char* or nullptr.

typo in pyplugins.ini

starting on TestPlayerInputs.py

Author: CS2ModServer

.gitignore

@@ -24,3 +24,4 @@ bld/
 /configs/admins.cfg
 /data/infractions.txt
 dump
+Adventure

PyPlugins/pyplugins.ini

@@ -28,8 +28,12 @@ tests/TestPlayerJump.py
 ## event 'OnPlayerLand'
 ## event 'OnPlayerAirborn'
 
+tests/TestPlayerInputs.py
+## buttons'n'bindings and stuff in here, lets see.
 
 ##junk below is old work to pull from while making 
 ##'good' working examples above
 #SampleEvents.py
-#ManyRaces/AdventureTest.py
+#ManyRaces/AdventureTest.py
+
+adventure/adventure.py

PyPlugins/tests/TestPlayerInputs.py

@@ -0,0 +1,65 @@
+import Source2Py
+ADVPlayer   = Source2Py.ADVPlayer
+
+import logging, inspect, traceback
+
+logging.basicConfig(filename='tests/TestPlayerInputs.log', encoding='utf-8', level=logging.DEBUG, format='[%(asctime)s]%(message)s', datefmt='%H:%M:%S')
+log = logging
+
+def alog(message: str, callername: bool = True):
+    caller = str("")
+    if (callername):
+        caller = "[" + str(inspect.stack()[1].function) + "] "
+    Source2Py.ServerPrint("[TestPlayerInputs]" + caller + str(message))
+    log.info(msg=("[TestPlayerInputs]" + caller + str(message)))
+    pass
+
+alog("START")
+class TestPlayerInputs:
+    def OnPluginLoad(self):
+        alog("")
+        pass
+
+    def OnGameFrame(self, 
+        simulating: bool,
+        bFirstTick: bool,
+        bLastTick: bool
+        ):
+
+        pass
+    def OnPlayer______(self, 
+        _slot: int
+        ):
+        alog("START")
+        try:
+            alog("_slot: " + str(_slot))
+            player = ADVPlayer(_slot)
+            alog(player.GetName() + " is airborn!")
+        except Exception as e:
+            alog(e)
+            alog(traceback.format_exc())
+        alog("END")
+        pass
+
+
+'''button_flags = 
+{
+    "IN_NONE":          0x0,
+    "IN_ALL":           0xffffffffffffffff,
+    "IN_ATTACK":        0x1,
+    "IN_JUMP":          0x2,
+    "IN_DUCK":          0x4,
+    "IN_FORWARD":       0x8,
+    "IN_BACK":          0x10,
+    "IN_USE":           0x20,
+    "IN_TURNLEFT":      0x80,
+    "IN_TURNRIGHT":     0x100,
+    "IN_MOVELEFT":      0x200,
+    "IN_MOVERIGHT":     0x400,
+    "IN_ATTACK2":       0x800,
+    "IN_RELOAD":        0x2000,
+    "IN_SPEED":         0x10000,
+    "IN_JOYAUTOSPRINT": 0x20000,
+
+}'''
+

PyPlugins/tests/TestPlayerJump.py

@@ -79,9 +79,33 @@ def OnPlayerJump(self,
 
         alog("START")
         try:
-            player = ADVPlayer(_slot)
             self.players_in_air[_slot] = True
-            alog(player.GetName() + " jumped!")
+            player = ADVPlayer(_slot)
+            name = player.GetName()
+            if (name):
+                alog(name + " jumped!")
+            else:
+                alog("player.GetName() returned nullptr (jumped!)")
+        except Exception as e:
+            alog(e)
+            alog(traceback.format_exc())
+        alog("END")
+        pass
+    def OnClientDisconnect(self, 
+        _slot: int, 
+        _reason: int, 
+        _name: str, 
+        _xuid: int, 
+        _networkID: str):
+        alog("START")
+        try:
+            alog("slot: " + str(_slot))
+            alog("reason: " + str(_reason))
+            alog(_name + " disconnected")
+            alog("xuid: " + str(_xuid))
+            alog("networkID: " + str(_networkID))
+            self.last_grounded.pop(_slot, None)
+            self.players_in_air.pop(_slot, None)
         except Exception as e:
             alog(e)
             alog(traceback.format_exc())
@@ -97,7 +121,12 @@ def OnPlayerLand(self,
         try:
             alog("_slot: " + str(_slot))
             player = ADVPlayer(_slot)
-            alog(player.GetName() + " landed!")
+            name = player.GetName()
+            if (name):
+                alog(name + " landed!")
+            else:
+                alog("player.GetName() returned nullptr (landed!)")
+
         except Exception as e:
             alog(e)
             alog(traceback.format_exc())
@@ -113,7 +142,11 @@ def OnPlayerAirborn(self,
         try:
             alog("_slot: " + str(_slot))
             player = ADVPlayer(_slot)
-            alog(player.GetName() + " is airborn!")
+            name = player.GetName()
+            if (name):
+                alog(name + " is airborn!")
+            else:
+                alog("player.GetName() returned nullptr (is airborn!)")
         except Exception as e:
             alog(e)
             alog(traceback.format_exc())

cfg/cs2fixes/cs2fixes.cfg

@@ -137,7 +137,7 @@ cs2f_idle_kick_min_players		0		// Minimum amount of connected clients to kick id
 cs2f_idle_kick_admins			1		// Whether to kick idle players with ADMFLAG_GENERIC
 
 // Button watch
-cs2f_enable_button_watch		0		// INCOMPATIBLE WITH CS#. Whether to enable button watch or not.
+cs2f_enable_button_watch		1		// INCOMPATIBLE WITH CS#. Whether to enable button watch or not.
 
 // EntWatch Settings
 entwatch_enable					0		// INCOMPATIBLE WITH CS#. Whether to enable EntWatch features

src/PyModule.h

@@ -134,6 +134,7 @@ PYBIND11_EMBEDDED_MODULE(Source2Py, m) {
 			.def("GetIndex", &ADVAPI::GetIndex)
 			.def("IsOnGround", &ADVAPI::IsOnGround)
 			.def("IsOnLadder", &ADVAPI::IsOnLadder)
+			.def("GetButtons", &ADVAPI::GetButtons)
 			.def("test", 
 				[](ADVAPI& self) -> int 
 				//Tristen, don't delete this, you'll eventually forget again.
@@ -142,6 +143,8 @@ PYBIND11_EMBEDDED_MODULE(Source2Py, m) {
 				})
 			;
 	}
+
+
 	m.def("CreateFakeEvent", 
 		[](const char* name, bool bForce) -> IGameEvent*
 		{

src/adventuremod.cpp

@@ -38,11 +38,26 @@ bool ADVAPI::IsValid()
 bool ADVAPI::IsOnGround()
 {
 	CBaseEntity* ent = (CBaseEntity*)GetPawn();
-	return ent->m_fFlags() & FL_ONGROUND;
+	if (ent)
+		return ent->m_fFlags() & FL_ONGROUND;
+	return false;
 }
 
 bool ADVAPI::IsOnLadder()
 {
 	CBaseEntity* ent = (CBaseEntity*)GetPawn();
-	return ent->m_MoveType() & MOVETYPE_LADDER;
+	if (ent)
+		return ent->m_MoveType() & MOVETYPE_LADDER;
+	return false;
 }
+
+uint64* ADVAPI::GetButtons()
+{
+	CBaseEntity* pawn = (CBaseEntity*)GetPawn();
+	CCSPlayerPawnBase* base = (CCSPlayerPawnBase*)pawn;
+	CPlayer_MovementServices* ms = base->m_pMovementServices();
+	// m_pButtonStates[0] is the mask of currently pressed buttons
+	// m_pButtonStates[1] is the mask of buttons that changed in the current frame
+	uint64* temp = ms->m_nButtons().m_pButtonStates();
+	return temp;
+}

src/adventuremod.h

@@ -23,7 +23,10 @@ class ADVAPI
 	CBaseEntity*			GetPawn()			
 	{ 
 		CCSPlayerController* pc = GetPC();
-		return (CBaseEntity*)pc->GetPawn();
+		if (pc)
+			return (CBaseEntity*)pc->GetPawn();
+		else
+			return nullptr;
 	}
 
 	int GetHealth();
@@ -32,7 +35,7 @@ class ADVAPI
 	bool IsValid();
 	bool IsOnGround();
 	bool IsOnLadder();
-
+	uint64* GetButtons();