projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2014-04-29 05:04:23 +01:00
parent 73f8ad85bc 63d0c5020d
commit 02ff93312e
229 changed files with 6226 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/GroupService.java
+10
View File
@@ -146,6 +146,12 @@ public class GroupService implements INetworkDispatch {
group.setGroupLeader(leader);
group.getMemberList().add(leader);
group.getMemberList().add(invited);
if (invited.getLevel() > leader.getLevel())
group.setGroupLevel(invited.getLevel());
else
group.setGroupLevel(leader.getLevel());
leader.makeAware(group);
leader.setGroupId(group.getObjectID());
invited.makeAware(group);
@@ -170,6 +176,10 @@ public class GroupService implements INetworkDispatch {
invited.makeAware(group);
invited.setGroupId(group.getObjectID());
invited.sendSystemMessage("@group:joined_self", (byte) 0);
if (group.getGroupLevel() < invited.getLevel())
group.setGroupLevel(invited.getLevel());
addGroupBuffsToMember(group, invited);
core.chatService.joinChatRoom(invited.getCustomName(), group.getChatRoomId(), true);