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

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

Browse Source
This commit is contained in:
Obique
2014-08-05 00:20:32 -05:00
parent ece28d57c7 413a89e924
commit 5df6aec213
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
options.cfg
+1 -1
View File
@@ -1,5 +1,5 @@
LOAD.SNAPSHOT_OBJECTS=1
LOAD.BUILDOUT_OBJECTS=1
LOAD.BUILDOUT_OBJECTS=0
#LOAD.BUILDOUT_ONLY_FOR="dathomir"
LOAD.RESOURCE.SYSTEM=1
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"));
}
src/services/command/CommandService.java
+7 -2
View File
@@ -451,8 +451,13 @@ public class CommandService implements INetworkDispatch {
}
public void processCombatCommand(CreatureObject attacker, SWGObject target, CombatCommand command, int actionCounter, String commandArgs) {
if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py")) {
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName(), "setup", core, attacker, target, command);
if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName().toLowerCase() + ".py")) {
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName().toLowerCase(), "setup", core, attacker, target, command);
} else {
if (FileUtilities.doesFileExist("scripts/commands/" + command.getCommandName().toLowerCase() + ".py")) {
System.err.print("Command " + command.getCommandName() + " is considered a combat command by the client but has a regular command script!");
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName().toLowerCase(), "run", core, attacker, target, "");
}
}
boolean success = true;