Fix drop bug

Fixed a bug where dead players would pick up their own dropped rupees. Adjusted collecting radius. Original release date: 21 December 2017
LeoLuxo · Apr 27, 2020 · 3111638 · 3111638
1 parent 1449ad2
commit 3111638
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lua/entities/blue_rupee/init.lua b/lua/entities/blue_rupee/init.lua
@@ -37,7 +37,7 @@ function ENT:Think()
 	for i, p in pairs( players ) do
 		d = math.Distance( p:GetPos().x, p:GetPos().y, self:GetPos().x, self:GetPos().y )
 
-		if ( d <= p:BoundingRadius() and self:GetPos().z + 32 >= p:GetPos().z and self:GetPos().z - 32 <= p:OBBMaxs().z ) then
+		if ( d <= p:BoundingRadius() and self:GetPos().z + 12 >= p:GetPos().z and self:GetPos().z <= p:OBBMaxs().z and p:Alive() ) then
 			p:SetHealth( p:Health() + 5 )
 			self:EmitSound( "rupee2.wav", 150, 100, 1, CHAN_AUTO )
 			self:Remove()

diff --git a/lua/entities/gold_rupee/init.lua b/lua/entities/gold_rupee/init.lua
@@ -37,7 +37,7 @@ function ENT:Think()
 	for i, p in pairs( players ) do
 		d = math.Distance( p:GetPos().x, p:GetPos().y, self:GetPos().x, self:GetPos().y )
 
-		if ( d <= p:BoundingRadius() and self:GetPos().z + 32 >= p:GetPos().z and self:GetPos().z - 32 <= p:OBBMaxs().z ) then
+		if ( d <= p:BoundingRadius() and self:GetPos().z + 12 >= p:GetPos().z and self:GetPos().z <= p:OBBMaxs().z and p:Alive() ) then
 			p:SetHealth( p:Health() + 300 )
 			self:EmitSound( "rupee3.wav", 150, 100, 1, CHAN_AUTO )
 			self:Remove()

diff --git a/lua/entities/green_rupee/init.lua b/lua/entities/green_rupee/init.lua
@@ -37,7 +37,7 @@ function ENT:Think()
 	for i, p in pairs( players ) do
 		d = math.Distance( p:GetPos().x, p:GetPos().y, self:GetPos().x, self:GetPos().y )
 
-		if ( d <= p:BoundingRadius() and self:GetPos().z + 32 >= p:GetPos().z and self:GetPos().z - 32 <= p:OBBMaxs().z ) then
+		if ( d <= p:BoundingRadius() and self:GetPos().z + 12 >= p:GetPos().z and self:GetPos().z <= p:OBBMaxs().z and p:Alive() ) then
 			p:SetHealth( p:Health() + 1 )
 			self:EmitSound( "rupee1.wav", 150, 100, 1, CHAN_AUTO )
 			self:Remove()

diff --git a/lua/entities/red_rupee/init.lua b/lua/entities/red_rupee/init.lua
@@ -37,7 +37,7 @@ function ENT:Think()
 	for i, p in pairs( players ) do
 		d = math.Distance( p:GetPos().x, p:GetPos().y, self:GetPos().x, self:GetPos().y )
 
-		if ( d <= p:BoundingRadius() and self:GetPos().z + 32 >= p:GetPos().z and self:GetPos().z - 32 <= p:OBBMaxs().z ) then
+		if ( d <= p:BoundingRadius() and self:GetPos().z + 12 >= p:GetPos().z and self:GetPos().z <= p:OBBMaxs().z and p:Alive() ) then
 			p:SetHealth( p:Health() + 20 )
 			self:EmitSound( "rupee2.wav", 150, 100, 1, CHAN_AUTO )
 			self:Remove()

diff --git a/lua/entities/silver_rupee/init.lua b/lua/entities/silver_rupee/init.lua
@@ -37,7 +37,7 @@ function ENT:Think()
 	for i, p in pairs( players ) do
 		d = math.Distance( p:GetPos().x, p:GetPos().y, self:GetPos().x, self:GetPos().y )
 
-		if ( d <= p:BoundingRadius() and self:GetPos().z + 32 >= p:GetPos().z and self:GetPos().z - 32 <= p:OBBMaxs().z ) then
+		if ( d <= p:BoundingRadius() and self:GetPos().z + 12 >= p:GetPos().z and self:GetPos().z <= p:OBBMaxs().z and p:Alive() ) then
 			p:SetHealth( p:Health() + 100 )
 			self:EmitSound( "rupee3.wav", 150, 100, 1, CHAN_AUTO )
 			self:Remove()