From 6a0558d0c2e1ef17a2287ba9d383920dd417ff2e Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 12 Dec 2010 13:48:14 +0000
Subject: [PATCH] * Fixed impossible condition in soundeffect script command
 (since athena-dev-2.1.1-mod1046, related r5841).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14583 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt | 1 +
 src/map/script.c    | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c2681fecc6..4c64502579 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
 Date	Added
 
 2010/12/12
+	* Fixed impossible condition in soundeffect script command (since athena-dev-2.1.1-mod1046, related r5841). [Ai4rei]
 	* Updates to the playBGM functionality (since r14335). [Ai4rei]
 	- Removed impossible condition in playBGM script command (from soundeffect).
 	- Removed unused code (retrieving of a bl) in playBGMall (from soundeffectall).
diff --git a/src/map/script.c b/src/map/script.c
index 8989aa37e9..2a308c5243 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10876,10 +10876,7 @@ BUILDIN_FUNC(soundeffect)
 
 	if(sd)
 	{
-		if(!st->rid)
-			clif_soundeffect(sd,map_id2bl(st->oid),name,type);
-		else
-			clif_soundeffect(sd,&sd->bl,name,type);
+		clif_soundeffect(sd,&sd->bl,name,type);
 	}
 	return 0;
 }