projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-16 06:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Simplified if-statement structure in CorpseService.clone()

Browse Source
This commit is contained in:
Mads Boddum
2016-10-10 13:04:00 +02:00
parent 134ffb1ca9
commit cc8ce0d135
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CorpseService.java
+39 -39
View File
@@ -375,48 +375,48 @@ public final class CorpseService extends Service {
Location facilityLocation = selectedFacility.getLocation();
FacilityData facilityData = facilityDataMap.get(selectedFacility.getTemplate());
if (facilityData != null) {
String cellName = facilityData.getCell();
CellObject cellObject = selectedFacility.getCellByName(cellName);
if (cellObject != null) {
// They should go on leave upon cloning
if(corpse.getPvpFaction() != PvpFaction.NEUTRAL)
new FactionIntent(corpse, PvpStatus.ONLEAVE).broadcast();
TubeData[] tubeData = facilityData.getTubeData();
int tubeCount = tubeData.length;
Location cloneLocation;
if (tubeCount > 0) {
TubeData randomData = tubeData[random.nextInt(tubeCount)];
cloneLocation = new Location(randomData.getTubeX(), 0, randomData.getTubeZ(), facilityLocation.getTerrain());
cloneLocation.setOrientation(facilityLocation.getOrientationX(), facilityLocation.getOrientationY(), facilityLocation.getOrientationZ(), facilityLocation.getOrientationW());
// The creature should point towards the entrance/exit of the tube
cloneLocation.rotateHeading(randomData.getTubeHeading());
} else {
cloneLocation = new Location(facilityData.getX(), facilityData.getY(), facilityData.getZ(), facilityLocation.getTerrain());
cloneLocation.rotateHeading(facilityData.getHeading());
}
new ObjectTeleportIntent(corpse, cellObject, cloneLocation).broadcast();
corpse.setPosture(Posture.UPRIGHT);
corpse.setTurnScale(1);
corpse.setMovementScale(1);
corpse.setHealth(corpse.getMaxHealth());
// TODO NGE: cloning debuff
return CloneResult.SUCCESS;
} else {
Log.e(this, "Cell %s was invalid for cloning facility %s", cellName, selectedFacility);
return CloneResult.INVALID_CELL;
}
} else {
if (facilityData == null) {
Log.e(this, "%s could not clone at facility %s because the object template is not in cloning_respawn.sdb", corpse, selectedFacility);
return CloneResult.TEMPLATE_MISSING;
}
String cellName = facilityData.getCell();
CellObject cellObject = selectedFacility.getCellByName(cellName);
if (cellObject == null) {
Log.e(this, "Cell %s was invalid for cloning facility %s", cellName, selectedFacility);
return CloneResult.INVALID_CELL;
}
// They should go on leave upon cloning
if (corpse.getPvpFaction() != PvpFaction.NEUTRAL) {
new FactionIntent(corpse, PvpStatus.ONLEAVE).broadcast();
}
TubeData[] tubeData = facilityData.getTubeData();
int tubeCount = tubeData.length;
Location cloneLocation;
if (tubeCount > 0) {
TubeData randomData = tubeData[random.nextInt(tubeCount)];
cloneLocation = new Location(randomData.getTubeX(), 0, randomData.getTubeZ(), facilityLocation.getTerrain());
cloneLocation.setOrientation(facilityLocation.getOrientationX(), facilityLocation.getOrientationY(), facilityLocation.getOrientationZ(), facilityLocation.getOrientationW());
// The creature should point towards the entrance/exit of the tube
cloneLocation.rotateHeading(randomData.getTubeHeading());
} else {
cloneLocation = new Location(facilityData.getX(), facilityData.getY(), facilityData.getZ(), facilityLocation.getTerrain());
cloneLocation.rotateHeading(facilityData.getHeading());
}
new ObjectTeleportIntent(corpse, cellObject, cloneLocation).broadcast();
corpse.setPosture(Posture.UPRIGHT);
corpse.setTurnScale(1);
corpse.setMovementScale(1);
corpse.setHealth(corpse.getMaxHealth());
// TODO NGE: cloning debuff
return CloneResult.SUCCESS;
}
/**