projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Waverunner
2014-03-30 15:09:55 -04:00
parent 64bfdb2b8b 6c1df547b4
commit bf0d27f8b2
11 changed files with 160 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/EntertainmentService.java
+3 -3
View File
@@ -65,7 +65,7 @@ public class EntertainmentService implements INetworkDispatch {
private ConcurrentHashMap<Integer,Performance> performancesByIndex = new ConcurrentHashMap<Integer,Performance>();
private ConcurrentHashMap<Integer,Performance> danceMap = new ConcurrentHashMap<Integer,Performance>();
private ConcurrentHashMap<String, Short> designMap = new ConcurrentHashMap<String, Short>();
private ConcurrentHashMap<String, Byte> designMap = new ConcurrentHashMap<String, Byte>();
//private Random ranWorkshop = new Random();
@@ -932,7 +932,7 @@ public class EntertainmentService implements INetworkDispatch {
public String getCustomizationString(int number){
synchronized (designMap) {
for (Entry<String, Short> entry : designMap.entrySet()) {
for (Entry<String, Byte> entry : designMap.entrySet()) {
if (entry.getValue().intValue() == number) {
return entry.getKey();
}
@@ -943,7 +943,7 @@ public class EntertainmentService implements INetworkDispatch {
public int getCustomizationValue(String customizationString) {
synchronized(designMap){
for(Entry<String, Short> entry : designMap.entrySet()) {
for(Entry<String, Byte> entry : designMap.entrySet()) {
if (entry.getKey().equals(customizationString)) {
return entry.getValue().intValue();
}