marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix an error when deleting a pipe when the end is contained

ipv6
Maikel de Vries 2016-12-23 18:09:33 +01:00
parent c7afed1aeb
commit aa7eb1210e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c
View File

@ -48,8 +48,11 @@ protected func Hit()
private func Destruction()
{
// remove the line first, so that it does not provoke errors on destruction
var line = GetConnectedLine();
// Remove the line first, so that it does not provoke errors on destruction.
// Actually there is an ill-defined state where line contains the pipe and is
// removed. Then line = GetConnectedLine() causes an error, instead use the
// slower find object variant.
var line = FindObject(Find_Func("IsConnectedTo", this));
if (line)
line->RemoveObject();
return;