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 
Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2014-04-13 00:49:58 +01:00
parent 03c5201cf4 7e9bb7ede5
commit 60972655dd
220 changed files with 8160 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+3 -1
View File
@@ -809,7 +809,9 @@ public class SimulationService implements INetworkDispatch {
PlayerObject ghost = (PlayerObject) object.getSlottedObject("ghost");
core.weatherService.sendWeather(object);
//core.chatService.joinChatRoom(object.getCustomName().toLowerCase(), "SWG." + core.getGalaxyName() + "." + object.getPlanet().getName());
if (!object.hasSkill(ghost.getProfessionWheelPosition())) {
object.showFlyText(OutOfBand.ProsePackage("@cbt_spam:skill_up"), 2.5f, new RGB(154, 205, 50), 0, true);
object.playEffectObject("clienteffect/skill_granted.cef", "");