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 pull request #28 from ProjectSWGCore/master

Browse Source 
Fork update
This commit is contained in:
tacef
2014-08-04 21:39:05 +02:00
parent 7a5a9d7327 cb91738fd1
commit 3ecc0c8e04
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/inspire.py
+1 -1
View File
@@ -34,7 +34,7 @@ def run(core, actor, target, commandString):
actor.sendSystemMessage('@performance:insp_buff_must_listen', 2)
return
if target.getPosition().getDistance2D(actor.getWorldPosition()) > float(20):
if target.getWorldPosition().getDistance2D(actor.getWorldPosition()) > float(20):
actor.sendSystemMessage(target.getCustomName() + ' is too far away to inspire.', 0)
return
src/services/EntertainmentService.java
+1 -1
View File
@@ -687,7 +687,7 @@ public class EntertainmentService implements INetworkDispatch {
final ScheduledFuture<?> spectatorTask = scheduler.scheduleAtFixedRate(() -> {
try {
if (spectator.getPosition().getDistance2D(performer.getWorldPosition()) > (float) 70) {
if (spectator.getWorldPosition().getDistance2D(performer.getWorldPosition()) > (float) 70) {
if(((performer.getPerformanceType()) ? "dance" : "music").equals("dance")) {
spectator.setPerformanceWatchee(null);
src/services/GroupService.java
+1 -1
View File
@@ -209,7 +209,7 @@ public class GroupService implements INetworkDispatch {
for(SWGObject otherMember : group.getMemberList()) {
if(otherMember != member) {
for(Buff buff : ((CreatureObject) otherMember).getBuffList().get()) {
if(buff.isGroupBuff() && otherMember.getPlanet() == member.getPlanet() && otherMember.getPosition().getDistance2D(member.getWorldPosition()) <= 80) {
if(buff.isGroupBuff() && otherMember.getPlanet() == member.getPlanet() && otherMember.getWorldPosition().getDistance2D(member.getWorldPosition()) <= 80) {
core.buffService.addBuffToCreature((CreatureObject) otherMember, buff.getBuffName(), member);
}
}
src/services/LoginService.java
+2 -1
View File
@@ -333,11 +333,12 @@ public class LoginService implements INetworkDispatch{
String characterName = resultSet.getString("firstName").replaceAll("\\s",""); ;
String lastName = resultSet.getString("lastName").replaceAll("\\s","");
if (lastName != null && lastName.length() > 0) characterName += " " + lastName;
enumerateCharacterId.addCharacter(
characterName,
resultSet.getInt("appearance"),
resultSet.getLong("Id"),
resultSet.getLong("id"),
resultSet.getInt("galaxyId"),
resultSet.getInt("statusId"));
}