Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 369ece8ecc, reversing
changes made to ddffe98299.
This commit is contained in:
RisTanA
2020-06-07 02:15:55 -07:00
parent 369ece8ecc
commit 9058eae8db
70 changed files with 1124 additions and 1274 deletions
@@ -247,7 +247,7 @@ public class vet_instance_reset extends script.base_script
obj_id owner = instance_data.getObjId("owner");
int startTime = instance_data.getInt("start_time");
int resetAt = getCalendarTime();
setObjVar(player, instance.PLAYER_INSTANCE + "." + instanceToRemove, resetAt + "_" + instance_id + "_" + owner + "_" + newStartTime);
setObjVar(player, instance.PLAYER_INSTANCE + "." + instanceToRemove, "" + resetAt + "_" + instance_id + "_" + owner + "_" + newStartTime);
instance_data = instance.getLockoutData(player, instanceToRemove);
if (instance_data != null && !instance_data.isEmpty())
{