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

Merge pull request #135 from AconiteGodOfSWG/roadmapfixes2

Browse Source 
roadmap fixes
This commit is contained in:
Tekaoh
2020-07-06 09:08:14 -04:00
committed by GitHub
parent 4e1713b2bc c4190aa9a5
commit 949c433172
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sku.0/sys.server/compiled/game/script/library/gcw.java
View File

@@ -2691,6 +2691,10 @@ public class gcw extends script.base_script
CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not configured to run a city invasion. Function returning False.");
return false;
}
if (city.equalsIgnoreCase("dearic") && utils.checkConfigFlag("GameServer", "lifeday")) {
CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not running because life day is turned on.");
return false;
}
return true;
}
public static int gcwGetNextInvasionHour(String cityName) throws InterruptedException

12
sku.0/sys.server/compiled/game/script/library/performance.java
View File

@@ -1424,10 +1424,6 @@ public class performance extends script.base_script
performanceMessageToSelf(actor, null, SID_DANCE_UNKNOWN_SELF);
return;
}
if (!notShapechanged(actor))
{
return;
}
if (!canPerformDance(actor, performanceIndex))
{
performanceMessageToSelf(actor, null, SID_DANCE_LACK_SKILL_SELF);
@@ -1561,10 +1557,6 @@ public class performance extends script.base_script
performanceMessageToSelf(actor, null, SID_DANCE_UNKNOWN_SELF);
return;
}
if (!notShapechanged(actor))
{
return;
}
if (!canPerformDance(actor, performanceIndex))
{
performanceMessageToSelf(actor, null, SID_DANCE_LACK_SKILL_SELF);
@@ -2876,10 +2868,6 @@ public class performance extends script.base_script
{
return false;
}
if (!notShapechanged(actor))
{
return false;
}
Vector available_dances = new Vector();
available_dances.setSize(0);
int num_items = dataTableGetNumRows(DATATABLE_PERFORMANCE);