From 10ed1a54523fdd5bcddfbccf44dd9c0a15ab8357 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 21 May 2016 17:43:47 -0400 Subject: Fixed removing plants bug --- gamemode/client/cl_quickmenu.lua | 2 ++ gamemode/init.lua | 7 +++++++ 2 files changed, 9 insertions(+) (limited to 'gamemode') diff --git a/gamemode/client/cl_quickmenu.lua b/gamemode/client/cl_quickmenu.lua index c56c675..d2c1961 100644 --- a/gamemode/client/cl_quickmenu.lua +++ b/gamemode/client/cl_quickmenu.lua @@ -10,7 +10,9 @@ function GM:OnContextMenuOpen() -- Derma Menu self.Think = function() + if !cMenuOpen then return end + //print(LocalPlayer():GetEyeTrace().Entity:GetClass()) if (input.IsMouseDown(MOUSE_RIGHT)) then local tr = LocalPlayer():GetEyeTrace().Entity diff --git a/gamemode/init.lua b/gamemode/init.lua index 468dba1..85d2a56 100644 --- a/gamemode/init.lua +++ b/gamemode/init.lua @@ -67,6 +67,13 @@ util.AddNetworkString('giveres') net.Receive('removeEntity', function(len, ply) local ent = net.ReadEntity() + if (ent:GetClass() == "gms_generic_plantable") then ply:SetNWInt( "plants", ply:GetNWInt( "plants" ) - 1 ) end + if ent.IsPlantChild then + + local plant = ent.PlantParent + if (plant.Children <= 1) then plant:Fadeout() end + + end ent:Remove() end) -- cgit v1.2.3-70-g09d2