Merge pull request #193 from Cre8or/master

FIX: Make acf_bulleteffect use SetEntity() instead of SetMagnitude()
nrlulz · Nov 2, 2015 · 3984b72 · 3984b72
2 parents c2a9ac4 + 5b51177
commit 3984b72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lua/acf/server/sv_acfballistics.lua b/lua/acf/server/sv_acfballistics.lua
@@ -238,7 +238,7 @@ function ACF_BulletClient( Index, Bullet, Type, Hit, HitPos )
 			Effect:SetAttachment( Index )		--Bulet Index
 			Effect:SetStart( Bullet.Flight/10 )	--Bullet Direction
 			Effect:SetOrigin( Bullet.Pos )
-			Effect:SetMagnitude( Bullet["Crate"] ) --Encodes the crate the ammo originates from so clientside knows the crate from wich to pull ammo data
+			Effect:SetEntity( Entity(Bullet["Crate"]) )
 			Effect:SetScale( 0 )
 		util.Effect( "ACF_BulletEffect", Effect, true, true )
 

diff --git a/lua/effects/acf_bulleteffect/init.lua b/lua/effects/acf_bulleteffect/init.lua
@@ -43,7 +43,7 @@ function EFFECT:Init( data )
 	else
 		--print("Creating Bullet Effect")
 		local BulletData = {}
-		BulletData.Crate = Entity(math.Round(data:GetMagnitude()))
+		BulletData.Crate = data:GetEntity()
 		--TODO: Check if it is actually a crate
 		if not IsValid(BulletData.Crate) then
 			self:Remove()