From 08511c08f461a8b1b87af0eb7de16235ec60599c Mon Sep 17 00:00:00 2001
From: Lex Robinson <lexi@lexi.org.uk>
Date: Thu, 30 Jan 2014 10:29:55 +0000
Subject: [PATCH] Support DarkRP 2.5.1 money merging

---
 lua/entities/darkrp_moneypot.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lua/entities/darkrp_moneypot.lua b/lua/entities/darkrp_moneypot.lua
index f5c0f93..5c2da0e 100644
--- a/lua/entities/darkrp_moneypot.lua
+++ b/lua/entities/darkrp_moneypot.lua
@@ -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)
@@ -38,6 +38,10 @@ function ENT:GetNumMoneyEntities()
     return #ents.FindByClass("spawned_money");
 end
 
+function ENT:InvalidateMoneyEntity(ent)
+    ent.hasMerged = true;
+end
+
 --------------------------------------
 --                                  --
 --        Duplicator support        --