projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-12 22:45:31 -04:00
Code Issues Projects Releases Wiki Activity

fixed #411

Browse Source
This commit is contained in:
Light2
2014-04-13 00:19:47 +02:00
parent 4ae9f292be
commit 5510ace39a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+2 -1
View File
@@ -375,7 +375,8 @@ public class TangibleObject extends SWGObject {
return getPvPBitmask() == 1 || getPvPBitmask() == 2;
}
} else if(attacker.getSlottedObject("ghost") == null)
return true;
return getPvPBitmask() == 1 || getPvPBitmask() == 2;
}
src/services/command/CommandService.java
+9 -2
View File
@@ -76,7 +76,7 @@ public class CommandService implements INetworkDispatch {
return false;
}
if (command.getCharacterAbility().length() > 0 && !actor.hasAbility(command.getCharacterAbility()) && !command.getCharacterAbility().equals("admin")) {
if (command.getCharacterAbility().length() > 0 && !actor.hasAbility(command.getCharacterAbility()) && !command.getCharacterAbility().equals("admin") && actor.getClient() != null) {
return false;
}
@@ -134,6 +134,10 @@ public class CommandService implements INetworkDispatch {
break;
case 2: // Self Only
if(actor.getClient() == null)
break;
if (target == null) {
target = actor;
}
@@ -173,7 +177,10 @@ public class CommandService implements INetworkDispatch {
TangibleObject object = (TangibleObject) target;
if (object.isAttackableBy(actor) || actor.getFactionStatus() < ((CreatureObject) object).getFactionStatus() || (!object.getFaction().equals("") && !object.getFaction().equals(actor.getFaction()))) {
if(object instanceof CreatureObject && actor.getFactionStatus() < ((CreatureObject) object).getFactionStatus())
return false;
if (object.isAttackableBy(actor) || (!object.getFaction().equals("") && !object.getFaction().equals(actor.getFaction()))) {
return false;
}
src/services/housing/HousingService.java
-6
View File
@@ -739,12 +739,6 @@ public class HousingService implements INetworkDispatch {
}
public void addItemToHouseItemList(TangibleObject item, SWGObject container){
BuildingObject building = (BuildingObject) container.getContainer();
building.getItemsList().add(item);
}
public String fetchPrivacyString(TangibleObject object){
final BuildingObject building = (BuildingObject) object.getAttachment("housing_parentstruct");
return building.getPrivacyString();