diff --git a/sku.0/sys.server/compiled/game/script/library/gcw.java b/sku.0/sys.server/compiled/game/script/library/gcw.java index e7b7796b5..d31f84c5a 100755 --- a/sku.0/sys.server/compiled/game/script/library/gcw.java +++ b/sku.0/sys.server/compiled/game/script/library/gcw.java @@ -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 diff --git a/sku.0/sys.server/compiled/game/script/library/performance.java b/sku.0/sys.server/compiled/game/script/library/performance.java index d1020dd0f..31de789ff 100755 --- a/sku.0/sys.server/compiled/game/script/library/performance.java +++ b/sku.0/sys.server/compiled/game/script/library/performance.java @@ -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);