lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed serious infinite loop issues coming from cubics.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-11-12 11:12:08 +00:00
parent 4c6ab9d594
commit 088500b750
3 changed files with 93 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
View File

@@ -74,7 +74,6 @@ public class CubicInstance
protected int _matk;
protected int _activationtime;
protected int _activationchance;
protected boolean _active;
private final boolean _givenByOther;
protected List<Skill> _skills = new ArrayList<>();
private Future<?> _disappearTask;
@@ -98,7 +97,6 @@ public class CubicInstance
_matk = mAtk;
_activationtime = activationtime * 1000;
_activationchance = activationchance;
_active = false;
_givenByOther = givenByOther;
switch (_id)
@@ -241,17 +239,14 @@ public class CubicInstance
_disappearTask = ThreadPool.schedule(new Disappear(), totallifetime); // disappear
}
/**
* Do action.
*/
public synchronized void doAction()
public void doAction()
{
if (_active)
if (_actionTask == null)
{
synchronized (this)
{
if (_actionTask == null)
{
return;
}
_active = true;
switch (_id)
{
case AQUA_CUBIC:
@@ -278,6 +273,9 @@ public class CubicInstance
}
}
}
}
}
}
/**
* Gets the id.
@@ -332,7 +330,6 @@ public class CubicInstance
}
_actionTask = null;
}
_active = false;
}
/**

18
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
View File

@@ -81,7 +81,6 @@ public class CubicInstance implements IIdentifiable
private final int _cubicDelay;
private final int _cubicSkillChance;
private final int _cubicMaxCount;
private boolean _active;
private final boolean _givenByOther;
private final List<Skill> _skills = new ArrayList<>();
@@ -97,7 +96,6 @@ public class CubicInstance implements IIdentifiable
_cubicDelay = cubicDelay * 1000;
_cubicSkillChance = cubicSkillChance;
_cubicMaxCount = cubicMaxCount;
_active = false;
_givenByOther = givenByOther;
switch (_cubicId)
@@ -185,14 +183,14 @@ public class CubicInstance implements IIdentifiable
_disappearTask = ThreadPool.schedule(new CubicDisappear(this), cubicDuration * 1000); // disappear
}
public synchronized void doAction()
public void doAction()
{
if (_active)
if (_actionTask == null)
{
synchronized (this)
{
if (_actionTask == null)
{
return;
}
_active = true;
switch (_cubicId)
{
case AQUA_CUBIC:
@@ -219,6 +217,9 @@ public class CubicInstance implements IIdentifiable
}
}
}
}
}
}
@Override
public int getId()
@@ -264,7 +265,6 @@ public class CubicInstance implements IIdentifiable
_actionTask.cancel(true);
_actionTask = null;
}
_active = false;
}
public void cancelDisappear()

18
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
View File

@@ -81,7 +81,6 @@ public class CubicInstance implements IIdentifiable
private final int _cubicDelay;
private final int _cubicSkillChance;
private final int _cubicMaxCount;
private boolean _active;
private final boolean _givenByOther;
private final List<Skill> _skills = new ArrayList<>();
@@ -97,7 +96,6 @@ public class CubicInstance implements IIdentifiable
_cubicDelay = cubicDelay * 1000;
_cubicSkillChance = cubicSkillChance;
_cubicMaxCount = cubicMaxCount;
_active = false;
_givenByOther = givenByOther;
switch (_cubicId)
@@ -185,14 +183,14 @@ public class CubicInstance implements IIdentifiable
_disappearTask = ThreadPool.schedule(new CubicDisappear(this), cubicDuration * 1000); // disappear
}
public synchronized void doAction()
public void doAction()
{
if (_active)
if (_actionTask == null)
{
synchronized (this)
{
if (_actionTask == null)
{
return;
}
_active = true;
switch (_cubicId)
{
case AQUA_CUBIC:
@@ -219,6 +217,9 @@ public class CubicInstance implements IIdentifiable
}
}
}
}
}
}
@Override
public int getId()
@@ -264,7 +265,6 @@ public class CubicInstance implements IIdentifiable
_actionTask.cancel(true);
_actionTask = null;
}
_active = false;
}
public void cancelDisappear()