swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-01 01:15:59 -04:00
Code Issues Projects Releases Wiki Activity

3.1 Config Refactor

Browse Source
This commit is contained in:
AconiteGodOfSWG
2021-03-28 16:44:33 -04:00
parent 694a499356
commit 355796dd48
148 changed files with 900 additions and 6277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/systems/combat/combat_base.java
+4 -7
View File
@@ -34,6 +34,8 @@ public class combat_base extends script.base_script
public static final int HIT_RESULT_STRIKETHROUGH = 9;
public static final String PROGRESSIVE_DAMAGE_COUNTER = "hitData.progressive.counter";
public static final string_id SID_NONE = new string_id();
public static final boolean PVP_DISABLED = utils.checkConfigFlag("GameServer", "disablePvP");
public boolean combatStandardAction(String actionName, obj_id self, obj_id target, String params, String successHandler, String failHandler) throws InterruptedException
{
return combatStandardAction(actionName, self, target, getCurrentWeapon(self), params, null, false, false, 0);
@@ -731,13 +733,8 @@ public class combat_base extends script.base_script
verbose = false;
if ((isPlayer(attackerData.id) && isPlayer(defenderData[0].id)) && (attackerData.id != defenderData[0].id))
{
String setting = getConfigSetting("GameServer", "disablePvP");
if (setting != null && (setting.equals("1") || setting.equals("true")))
{
if (verbose)
{
return false;
}
if(PVP_DISABLED) {
return false;
}
}
if (isDead(attackerData.id))