Fixed #7359 (createMarker triggers onMarkerHit)

sbx320 · sbx320 · commit c3ce33588869 · 2015-08-13T22:40:52.000+02:00
diff --git a/MTA10_Server/mods/deathmatch/logic/CMarker.cpp b/MTA10_Server/mods/deathmatch/logic/CMarker.cpp
@@ -291,6 +291,10 @@ void CMarker::SetIcon ( unsigned char ucIcon )
 
 void CMarker::Callback_OnCollision ( CColShape& Shape, CElement& Element )
 {
+    // Do not call on ourselves #7359
+    if ( this == &Element )
+        return;
+
     // Matching interior?
     if ( GetInterior () == Element.GetInterior () )
     {

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,10 @@ void CMarker::SetIcon ( unsigned char ucIcon )`
`291`	`291`
`292`	`292`	`void CMarker::Callback_OnCollision ( CColShape& Shape, CElement& Element )`
`293`	`293`	`{`
	`294`	`+ // Do not call on ourselves #7359`
	`295`	`+ if ( this == &Element )`
	`296`	`+ return;`
	`297`	`+`
`294`	`298`	`// Matching interior?`
`295`	`299`	`if ( GetInterior () == Element.GetInterior () )`
`296`	`300`	`{`