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

master merge

Browse Source
This commit is contained in:
CharonInferar
2014-07-14 15:32:28 +02:00
parent becca491b4
commit cc28f80394
80 changed files with 1132 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+14 -5
View File
@@ -197,12 +197,16 @@ public class PlayerService implements INetworkDispatch {
}, 0, 1000, TimeUnit.MILLISECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
long[] ids = creature.getAwareObjects().stream().mapToLong(SWGObject::getObjectID).toArray();
for(int i = 0; i < ids.length; i++) {
for(int j = 0; j < ids.length; j++) {
if(ids[i] == ids[j] && i != j)
System.err.println("Detected duplicate ids, Template " + core.objectService.getObject(ids[i]).getTemplate());
try {
long[] ids = creature.getAwareObjects().stream().mapToLong(SWGObject::getObjectID).toArray();
for(int i = 0; i < ids.length; i++) {
for(int j = 0; j < ids.length; j++) {
if(ids[i] == ids[j] && i != j)
System.err.println("Detected duplicate ids, Template " + core.objectService.getObject(ids[i]).getTemplate());
}
}
} catch (Exception e) {
e.printStackTrace();
}
}, 0, 5000, TimeUnit.MILLISECONDS));
@@ -374,6 +378,11 @@ public class PlayerService implements INetworkDispatch {
CreatureObject targetPlayer = (CreatureObject) core.objectService.getObject(request.getCharacterId());
if (targetPlayer == null) {
System.err.println("PlayerService::GuildRequestMessage: Target is null: " + request.getCharacterId());
return;
}
if (targetPlayer.getGuildId() != 0) {
Guild targetGuild = core.guildService.getGuildById(targetPlayer.getGuildId());
GuildResponseMessage response = new GuildResponseMessage(request.getCharacterId(), targetGuild.getName());