From 75001c3ddc28a58baf554a5db6b9a8a3294afb8e Mon Sep 17 00:00:00 2001 From: Linventif Date: Wed, 13 Mar 2024 20:47:56 +0100 Subject: [PATCH] fix: remove log tempoary --- lua/gmod_integration/server/sv_players.lua | 231 ++++++++++----------- 1 file changed, 114 insertions(+), 117 deletions(-) diff --git a/lua/gmod_integration/server/sv_players.lua b/lua/gmod_integration/server/sv_players.lua index f1bffd2..8a7d6bb 100644 --- a/lua/gmod_integration/server/sv_players.lua +++ b/lua/gmod_integration/server/sv_players.lua @@ -2,7 +2,7 @@ // Methods // -hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) +function gmInte.playerReady(ply) if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end // Initialize Time @@ -11,13 +11,6 @@ hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) // Send Public Config gmInte.publicGetConfig(ply) - // Send Player Ready - gmInte.playerReady(ply) -end) - -function gmInte.playerReady(ply) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - gmInte.http.post("/players/" .. ply:SteamID64() .. "/ready", { ["player"] = gmInte.getPlayerFormat(ply) }) @@ -38,98 +31,102 @@ function gmInte.playerDisconnected(ply) ) end -function gmInte.playerSpawn(ply) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end +-- function gmInte.playerSpawn(ply) +-- if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - gmInte.http.post("/players/" .. ply:SteamID64() .. "/spawn", - { - ["player"] = gmInte.getPlayerFormat(ply) - } - ) -end +-- gmInte.http.post("/players/" .. ply:SteamID64() .. "/spawn", +-- { +-- ["player"] = gmInte.getPlayerFormat(ply) +-- } +-- ) +-- end -function gmInte.postLogPlayerDeath(ply, inflictor, attacker) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - if (!attacker:IsValid() || !attacker:IsPlayer(attacker)) then return end - if (!inflictor:IsValid()) then return end +-- function gmInte.postLogPlayerDeath(ply, inflictor, attacker) +-- if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end +-- if (!attacker:IsValid() || !attacker:IsPlayer(attacker)) then return end +-- if (!inflictor:IsValid()) then return end - gmInte.http.post("/logs/playerDeath", - { - ["player"] = gmInte.getPlayerFormat(ply), - ["inflictor"] = gmInte.getEntityFormat(inflictor), - ["attacker"] = gmInte.getPlayerFormat(attacker) - } - ) -end +-- gmInte.http.post("/logs/playerDeath", +-- { +-- ["player"] = gmInte.getPlayerFormat(ply), +-- ["inflictor"] = gmInte.getEntityFormat(inflictor), +-- ["attacker"] = gmInte.getPlayerFormat(attacker) +-- } +-- ) +-- end -function gmInte.postLogPlayerInitialSpawn(ply) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end +-- function gmInte.postLogPlayerInitialSpawn(ply) +-- if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - gmInte.http.post("/logs/playerInitialSpawn", - { - ["ply"] = gmInte.getPlayerFormat(ply) - } - ) -end +-- gmInte.http.post("/logs/playerInitialSpawn", +-- { +-- ["ply"] = gmInte.getPlayerFormat(ply) +-- } +-- ) +-- end -function gmInte.postLogPlayerHurt(ply, attacker, healthRemaining, damageTaken) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - if (!attacker:IsValid() || !attacker:IsPlayer(attacker)) then return end +-- function gmInte.postLogPlayerHurt(ply, attacker, healthRemaining, damageTaken) +-- if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end +-- if (!attacker:IsValid() || !attacker:IsPlayer(attacker)) then return end - // Wait a second to see if the player is going to be hurt again - ply.gmodInteLastHurt = ply.gmodInteLastHurt || {} - local locCurTime = CurTime() - ply.gmodInteLastHurt[attacker:SteamID64()] = locCurTime +-- // Wait a second to see if the player is going to be hurt again +-- ply.gmodInteLastHurt = ply.gmodInteLastHurt || {} +-- local locCurTime = CurTime() +-- ply.gmodInteLastHurt[attacker:SteamID64()] = locCurTime - timer.Simple(1, function() - if (ply.gmodInteLastHurt[attacker:SteamID64()] != locCurTime) then - ply.gmodInteTotalDamage = ply.gmodInteTotalDamage || 0 - ply.gmodInteTotalDamage = ply.gmodInteTotalDamage + damageTaken - return - end +-- timer.Simple(1, function() +-- if (ply.gmodInteLastHurt[attacker:SteamID64()] != locCurTime) then +-- ply.gmodInteTotalDamage = ply.gmodInteTotalDamage || 0 +-- ply.gmodInteTotalDamage = ply.gmodInteTotalDamage + damageTaken +-- return +-- end - gmInte.http.post("/logs/playerHurt", - { - ["victim"] = gmInte.getPlayerFormat(ply), - ["attacker"] = gmInte.getPlayerFormat(attacker), - ["healthRemaining"] = healthRemaining, - ["damageTaken"] = ply.gmodInteTotalDamage - } - ) - end) -end +-- gmInte.http.post("/logs/playerHurt", +-- { +-- ["victim"] = gmInte.getPlayerFormat(ply), +-- ["attacker"] = gmInte.getPlayerFormat(attacker), +-- ["healthRemaining"] = healthRemaining, +-- ["damageTaken"] = ply.gmodInteTotalDamage +-- } +-- ) +-- end) +-- end -function gmInte.postLogPlayerSpawnedSomething(object, ply, ent, model) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - if (!ent:IsValid()) then return end +-- function gmInte.postLogPlayerSpawnedSomething(object, ply, ent, model) +-- if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end +-- if (!ent:IsValid()) then return end - gmInte.http.post("/logs/playerSpawnedSomething", - { - ["object"] = object, - ["player"] = gmInte.getPlayerFormat(ply), - ["entity"] = gmInte.getEntityFormat(ent), - ["model"] = model || "" - } - ) -end +-- gmInte.http.post("/logs/playerSpawnedSomething", +-- { +-- ["object"] = object, +-- ["player"] = gmInte.getPlayerFormat(ply), +-- ["entity"] = gmInte.getEntityFormat(ent), +-- ["model"] = model || "" +-- } +-- ) +-- end -function gmInte.postLogPlayerGivet(ply, class, swep) - if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end +-- function gmInte.postLogPlayerGivet(ply, class, swep) +-- if (!ply:IsValid() || !ply:IsPlayer(ply)) then return end - gmInte.http.post("/logs/playerGive", - { - ["player"] = gmInte.getPlayerFormat(ply), - ["class"] = class, - ["swep"] = swep - } - ) -end +-- gmInte.http.post("/logs/playerGive", +-- { +-- ["player"] = gmInte.getPlayerFormat(ply), +-- ["class"] = class, +-- ["swep"] = swep +-- } +-- ) +-- end // // Hooks // +hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) + gmInte.playerReady(ply) +end) + hook.Add("ShutDown", "gmInte:Server:Shutdown:SavePlayers", function() for ply, ply in pairs(player.GetAll()) do gmInte.playerDisconnected(ply) @@ -145,50 +142,50 @@ hook.Add("PlayerDisconnected", "gmInte:Player:Disconnect", function(ply) gmInte.playerDisconnected(ply) end) -hook.Add("PlayerSpawn", "gmInte:Player:Spawn", function(ply) - gmInte.playerSpawn(ply) -end) +-- hook.Add("PlayerSpawn", "gmInte:Player:Spawn", function(ply) +-- gmInte.playerSpawn(ply) +-- end) -hook.Add("PlayerInitialSpawn", "gmInte:Player:InitialSpawn", function(ply) - gmInte.postLogPlayerInitialSpawn(ply) -end) +-- hook.Add("PlayerInitialSpawn", "gmInte:Player:InitialSpawn", function(ply) +-- gmInte.postLogPlayerInitialSpawn(ply) +-- end) -hook.Add("PlayerGiveSWEP", "gmInte:Player:SWEPs", function( ply, class, swep ) - gmInte.postLogPlayerGivet(ply, class, swep) -end) +-- hook.Add("PlayerGiveSWEP", "gmInte:Player:SWEPs", function( ply, class, swep ) +-- gmInte.postLogPlayerGivet(ply, class, swep) +-- end) -hook.Add("PlayerDeath", "gmInte:Player:Death", function(ply, inflictor, attacker) - gmInte.postLogPlayerDeath(ply, inflictor, attacker) -end) +-- hook.Add("PlayerDeath", "gmInte:Player:Death", function(ply, inflictor, attacker) +-- gmInte.postLogPlayerDeath(ply, inflictor, attacker) +-- end) -hook.Add("PlayerHurt", "gmInte:Player:Hurt", function(ply, attacker, healthRemaining, damageTaken) - gmInte.postLogPlayerHurt(ply, attacker, healthRemaining, damageTaken) -end) +-- hook.Add("PlayerHurt", "gmInte:Player:Hurt", function(ply, attacker, healthRemaining, damageTaken) +-- gmInte.postLogPlayerHurt(ply, attacker, healthRemaining, damageTaken) +-- end) -hook.Add("PlayerSpawnedProp", "gmInte:Player:SpawnedProp", function(ply, model, ent) - gmInte.postLogPlayerSpawnedSomething("SENT", ply, ent, model) -end) +-- hook.Add("PlayerSpawnedProp", "gmInte:Player:SpawnedProp", function(ply, model, ent) +-- gmInte.postLogPlayerSpawnedSomething("SENT", ply, ent, model) +-- end) -hook.Add("PlayerSpawnedSENT", "gmInte:Player:SpawnedSENT", function(ply, ent) - gmInte.postLogPlayerSpawnedSomething("SENT", ply, ent) -end) +-- hook.Add("PlayerSpawnedSENT", "gmInte:Player:SpawnedSENT", function(ply, ent) +-- gmInte.postLogPlayerSpawnedSomething("SENT", ply, ent) +-- end) -hook.Add("PlayerSpawnedNPC", "gmInte:Player:SpawnedNPC", function(ply, ent) - gmInte.postLogPlayerSpawnedSomething("NPC", ply, ent) -end) +-- hook.Add("PlayerSpawnedNPC", "gmInte:Player:SpawnedNPC", function(ply, ent) +-- gmInte.postLogPlayerSpawnedSomething("NPC", ply, ent) +-- end) -hook.Add("PlayerSpawnedVehicle", "gmInte:Player:SpawnedVehicle", function(ply, ent) - gmInte.postLogPlayerSpawnedSomething("Vehicle", ply, ent) -end) +-- hook.Add("PlayerSpawnedVehicle", "gmInte:Player:SpawnedVehicle", function(ply, ent) +-- gmInte.postLogPlayerSpawnedSomething("Vehicle", ply, ent) +-- end) -hook.Add("PlayerSpawnedEffect", "gmInte:Player:SpawnedEffect", function(ply, model, ent) - gmInte.postLogPlayerSpawnedSomething("Effect", ply, ent, model) -end) +-- hook.Add("PlayerSpawnedEffect", "gmInte:Player:SpawnedEffect", function(ply, model, ent) +-- gmInte.postLogPlayerSpawnedSomething("Effect", ply, ent, model) +-- end) -hook.Add("PlayerSpawnedRagdoll", "gmInte:Player:SpawnedRagdoll", function(ply, model, ent) - gmInte.postLogPlayerSpawnedSomething("Ragdoll", ply, ent, model) -end) +-- hook.Add("PlayerSpawnedRagdoll", "gmInte:Player:SpawnedRagdoll", function(ply, model, ent) +-- gmInte.postLogPlayerSpawnedSomething("Ragdoll", ply, ent, model) +-- end) -hook.Add("PlayerSpawnedSWEP", "gmInte:Player:SpawnedSWEP", function(ply, ent) - gmInte.postLogPlayerSpawnedSomething("SWEP", ply, ent) -end) \ No newline at end of file +-- hook.Add("PlayerSpawnedSWEP", "gmInte:Player:SpawnedSWEP", function(ply, ent) +-- gmInte.postLogPlayerSpawnedSomething("SWEP", ply, ent) +-- end) \ No newline at end of file