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

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

Browse Source
This commit is contained in:
Josh-Larson
2014-07-29 23:31:36 -05:00
parent ba3a4a9139 58b24dcffb
commit dd010b8778
11 changed files with 738 additions and 1451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
-3
View File
@@ -62,7 +62,6 @@ import services.BuffService;
import services.CharacterService;
import services.ConnectionService;
import services.ConversationService;
import services.DevService;
import services.EntertainmentService;
import services.GroupService;
import services.housing.HousingService;
@@ -197,7 +196,6 @@ public class NGECore {
public AIService aiService;
public MissionService missionService;
public InstanceService instanceService;
public DevService devService;
public SurveyService surveyService;
public ResourceService resourceService;
public ConversationService conversationService;
@@ -554,7 +552,6 @@ public class NGECore {
browserService = new BrowserService(this);
//battlefieldService = new BattlefieldService(this);
devService = new DevService(this);
DevLogQueuer devLogQueuer = new DevLogQueuer();
src/services/DevService.java
-1412
View File
File diff suppressed because it is too large Load Diff
src/services/GuildService.java
+8 -2
View File
@@ -1124,8 +1124,14 @@ public class GuildService implements INetworkDispatch {
public boolean removeGuild(int id) {
Guild guild = getGuildById(id);
if (guild != null)
return true;
if (guild != null) {
if (object.getGuildList().remove(guild.getString())) {
object.getGuilds().remove(id);
if (!object.getGuilds().containsKey(id)) return true;
else return false;
}
else return false;
}
return false;
}