Skip to content

Commit

Permalink
Support DarkRP 2.5.1 money merging
Browse files Browse the repository at this point in the history
  • Loading branch information
Lexicality committed Jan 30, 2014
1 parent 214dd71 commit 08511c0
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lua/entities/darkrp_moneypot.lua
Expand Up @@ -25,7 +25,7 @@ if (CLIENT) then return; end
--------------------------------------
function ENT:IsMoneyEntity(ent)
return ent:GetClass() == "spawned_money";
return ent:GetClass() == "spawned_money" and not ent.hasMerged;
end
function ENT:SpawnMoneyEntity(amount)
Expand All @@ -38,6 +38,10 @@ function ENT:GetNumMoneyEntities()
return #ents.FindByClass("spawned_money");
end
function ENT:InvalidateMoneyEntity(ent)
ent.hasMerged = true;
end
--------------------------------------
-- --
-- Duplicator support --
Expand Down

0 comments on commit 08511c0

Please sign in to comment.