From 962a2f4fe08560ca3c91b18aecb6decd8c5c64c3 Mon Sep 17 00:00:00 2001 From: atom0s Date: Wed, 29 Mar 2017 12:30:39 -0700 Subject: [PATCH] Updated copyrights to proper year. Fixed issues with timer library. (Thanks matix!) --- Ashita.dll | Bin 2001920 -> 2001920 bytes addons/distance/distance.lua | 2 +- addons/fps/fps.lua | 2 +- addons/libs/common.lua | 2 +- addons/libs/ffxi/enums.lua | 2 +- addons/libs/ffxi/recast.lua | 2 +- addons/libs/ffxi/targets.lua | 2 +- addons/libs/ffxi/vanatime.lua | 2 +- addons/libs/ffxi/weather.lua | 2 +- addons/libs/imguidef.lua | 2 +- addons/libs/logging.lua | 2 +- addons/libs/mathex.lua | 2 +- addons/libs/settings.lua | 2 +- addons/libs/stringex.lua | 2 +- addons/libs/tableex.lua | 2 +- addons/libs/timer.lua | 10 +++++----- addons/timestamp/timestamp.lua | 2 +- addons/tparty/tparty.lua | 2 +- injector.exe | Bin 173568 -> 173568 bytes 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Ashita.dll b/Ashita.dll index 81ad49667a5ec8e043740288b3e83aaf6b6f576a..da9ffdeb0fead5a8ef9b68c59ef44f6ab82752ea 100644 GIT binary patch delta 238 zcmZpeQPnV`YJ&$OvoY75W^cxJZ$=Pi0%B$$W&vVWAZ7z%b|B^eVoo6D0%Gp%-i$ma z?^y#iMlb*Y6A;G$afK2uLj?yfNQeO@#{*=G0Pz)|+!ch}bpHoDk|3M6XFuQ()DU{(I8+IJq-owEg(Z{UAb*KILG+rR)17dz4764*FAQl2*VIUR(Vo@L# a17dL?mH=W&AeI7RX&{!_{(PFOGrHSQLoG afLI)eC4g8Gh^2s78i-}KKc6Nm`4s^8cugw+ diff --git a/addons/distance/distance.lua b/addons/distance/distance.lua index fbe788b..3217608 100644 --- a/addons/distance/distance.lua +++ b/addons/distance/distance.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/fps/fps.lua b/addons/fps/fps.lua index a45097f..70702e1 100644 --- a/addons/fps/fps.lua +++ b/addons/fps/fps.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/common.lua b/addons/libs/common.lua index cbe7194..5839e00 100644 --- a/addons/libs/common.lua +++ b/addons/libs/common.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/ffxi/enums.lua b/addons/libs/ffxi/enums.lua index 9c6fc59..e181300 100644 --- a/addons/libs/ffxi/enums.lua +++ b/addons/libs/ffxi/enums.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/ffxi/recast.lua b/addons/libs/ffxi/recast.lua index 6af2ccf..e157156 100644 --- a/addons/libs/ffxi/recast.lua +++ b/addons/libs/ffxi/recast.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/ffxi/targets.lua b/addons/libs/ffxi/targets.lua index eb2298b..7b7d15c 100644 --- a/addons/libs/ffxi/targets.lua +++ b/addons/libs/ffxi/targets.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/ffxi/vanatime.lua b/addons/libs/ffxi/vanatime.lua index e7871bd..bb7a588 100644 --- a/addons/libs/ffxi/vanatime.lua +++ b/addons/libs/ffxi/vanatime.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/ffxi/weather.lua b/addons/libs/ffxi/weather.lua index 0ab53c2..2f71cab 100644 --- a/addons/libs/ffxi/weather.lua +++ b/addons/libs/ffxi/weather.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/imguidef.lua b/addons/libs/imguidef.lua index b2b7c50..6b5c798 100644 --- a/addons/libs/imguidef.lua +++ b/addons/libs/imguidef.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/logging.lua b/addons/libs/logging.lua index 20612ac..294ce2a 100644 --- a/addons/libs/logging.lua +++ b/addons/libs/logging.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/mathex.lua b/addons/libs/mathex.lua index c5cf0b2..98a40e0 100644 --- a/addons/libs/mathex.lua +++ b/addons/libs/mathex.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/settings.lua b/addons/libs/settings.lua index 1210fda..9817030 100644 --- a/addons/libs/settings.lua +++ b/addons/libs/settings.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/stringex.lua b/addons/libs/stringex.lua index f96d417..53d8e18 100644 --- a/addons/libs/stringex.lua +++ b/addons/libs/stringex.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/tableex.lua b/addons/libs/tableex.lua index 544df2d..9ea1617 100644 --- a/addons/libs/tableex.lua +++ b/addons/libs/tableex.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/libs/timer.lua b/addons/libs/timer.lua index 61deb91..6c97286 100644 --- a/addons/libs/timer.lua +++ b/addons/libs/timer.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to @@ -74,7 +74,7 @@ local function once(delay, func, ...) if (func) then t.Function = func; end - f.Args = {...}; + t.Args = {...}; table.insert(ashita.timer.timersonce, t); return true; @@ -190,7 +190,7 @@ local function pulse(name) -- Handle the normal timers.. for k, v in pairs(ashita.timer.timers) do if (v.Status == TIMER_PAUSED) then - v.Last = os.timer() - v.Diff; + v.Last = os.time() - v.Diff; elseif (v.Status == TIMER_RUNNING and (v.Last + v.Delay) <= os.time()) then v.Last = os.time(); v.n = v.n + 1; @@ -210,14 +210,14 @@ local function pulse(name) -- Handle the once timers.. for k, v in pairs(ashita.timer.timersonce) do - if (v.Finish <= os.timer()) then + if (v.Finish <= os.time()) then local a, b, c, d, e, f = pcall(v.Function, unpack(v.Args)); if (a == nil or a == false) then print(_addon.name .. ' - timer.lua pcall error: ' .. tostring(b)); end -- Remove the timer.. - ashita.timer.timersonce[name] = nil; + ashita.timer.timersonce[k] = nil; end end end diff --git a/addons/timestamp/timestamp.lua b/addons/timestamp/timestamp.lua index 955535d..1b6d197 100644 --- a/addons/timestamp/timestamp.lua +++ b/addons/timestamp/timestamp.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/addons/tparty/tparty.lua b/addons/tparty/tparty.lua index 9390d00..a9d1282 100644 --- a/addons/tparty/tparty.lua +++ b/addons/tparty/tparty.lua @@ -1,5 +1,5 @@ --[[ -* Ashita - Copyright (c) 2014 - 2016 atom0s [atom0s@live.com] +* Ashita - Copyright (c) 2014 - 2017 atom0s [atom0s@live.com] * * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to diff --git a/injector.exe b/injector.exe index 32f79f975666fbbd88c2883d49a3c53d87c0bb0f..349d4c202e69b6b343dbbcce06404012388744b5 100644 GIT binary patch delta 117 zcmZoT!_{zxYXKv(9M_%A%#0g8dF?kZYu}fA(K+_*6)cR~D_EF176Je{fFhd!