Fixed pet status bar disappears when resummoning while dead.
Contributed by Sahar.
This commit is contained in:
parent
09ee6603af
commit
c1f6f6689d
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
@ -407,8 +407,13 @@ public abstract class Summon extends Playable
|
|||||||
|
|
||||||
public void unSummon(PlayerInstance owner)
|
public void unSummon(PlayerInstance owner)
|
||||||
{
|
{
|
||||||
if (isSpawned() && !isDead())
|
if (isSpawned())
|
||||||
{
|
{
|
||||||
|
if (isDead())
|
||||||
|
{
|
||||||
|
stopDecay();
|
||||||
|
}
|
||||||
|
|
||||||
// Prevent adding effects while unsummoning.
|
// Prevent adding effects while unsummoning.
|
||||||
setInvul(true);
|
setInvul(true);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user