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

Prevent isSkillAllowed lock by SkillTreesData loading status variable.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-01-28 11:11:46 +00:00
parent 7a20f03af5
commit 8ebd210ac3
15 changed files with 60 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1692,7 +1691,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1692,7 +1691,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1692,7 +1691,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1692,7 +1691,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1692,7 +1691,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1692,7 +1691,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1694,7 +1693,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1717,7 +1716,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1680,7 +1679,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1680,7 +1679,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1680,7 +1679,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1680,7 +1679,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1680,7 +1679,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -116,7 +115,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -129,7 +128,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -160,7 +159,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1703,7 +1702,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}

9
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -117,7 +116,7 @@ public class SkillTreesData implements IXmlReader
/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
private final AtomicBoolean _isLoading = new AtomicBoolean();
private boolean _loading = true;
/**
* Instantiates a new skill trees data.
@ -130,7 +129,7 @@ public class SkillTreesData implements IXmlReader
@Override
public void load()
{
_isLoading.set(true);
_loading = true;
_classSkillTrees.clear();
_collectSkillTree.clear();
@ -161,7 +160,7 @@ public class SkillTreesData implements IXmlReader
// Logs a report with skill trees info.
report();
_isLoading.set(false);
_loading = false;
}
/**
@ -1680,7 +1679,7 @@ public class SkillTreesData implements IXmlReader
}
// Prevent accidental skill remove during reload
if (_isLoading.get())
if (_loading)
{
return true;
}