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

merge conflict resolved

Browse Source
This commit is contained in:
CharonInferar
2014-06-11 16:50:29 +02:00
parent 755e9659fd
commit 5836699b41
3 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/playercities/PlayerCity.java
-30
View File
@@ -636,15 +636,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -683,15 +677,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -757,15 +745,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -801,15 +783,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -843,15 +819,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);