projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-20 10:03:02 -04:00
Code Issues Projects Releases Wiki Activity

Fixed null checks and improved logging in EntertainmentService

Browse Source
This commit is contained in:
Obique
2019-02-07 09:13:10 -06:00
parent 7af986a673
commit 7ee7a4e975
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/services/gameplay/entertainment/EntertainmentService.java
+7 -1
View File
@@ -38,6 +38,7 @@ import com.projectswg.holocore.intents.gameplay.player.experience.ExperienceInte
import com.projectswg.holocore.intents.support.global.chat.SystemMessageIntent;
import com.projectswg.holocore.intents.support.global.zone.PlayerEventIntent;
import com.projectswg.holocore.intents.support.global.zone.PlayerTransformedIntent;
import com.projectswg.holocore.resources.support.data.server_info.StandardLog;
import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader;
import com.projectswg.holocore.resources.support.data.server_info.loader.PerformanceLoader.PerformanceInfo;
import com.projectswg.holocore.resources.support.global.player.Player;
@@ -418,12 +419,17 @@ public class EntertainmentService extends Service {
Performance performance = performerMap.get(performer.getObjectId());
if (performance == null) {
Log.e("Performer %s wasn't in performermap", performer);
StandardLog.onPlayerError(this, performer, "is not in performerMap");
return;
}
String performanceName = performance.getPerformanceName();
PerformanceInfo performanceData = DataLoader.performances().getPerformanceByName(performanceName);
if (performanceData == null) {
StandardLog.onPlayerError(this, performer, "was performing unknown performance: '%s'", performanceName);
return;
}
int flourishXpMod = performanceData.getFlourishXpMod();
int performanceCounter = performer.getPerformanceCounter();
int xpGained = performanceCounter * flourishXpMod;