From 44c7297a4a7821b65b58bcd52c424b3003e5f2ea Mon Sep 17 00:00:00 2001 From: shagu Date: Sat, 19 Nov 2022 17:40:51 +0100 Subject: [PATCH] libs: don't rely on sane global environment some addons like to provide a broken _G variable to the global environment breaking every other addon that relies on it if existing. With this commit, make ShaguTweaks no longer re-use the global _G, even if existing. --- libs/libcast.lua | 3 +-- libs/libdebuff.lua | 3 +-- libs/libhealth.lua | 3 +-- libs/libnameplate.lua | 2 +- libs/libpredict.lua | 3 +-- libs/libspell.lua | 3 +-- libs/libtipscan.lua | 3 +-- libs/libunitscan.lua | 3 +-- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/libs/libcast.lua b/libs/libcast.lua index d333c7e..823f935 100644 --- a/libs/libcast.lua +++ b/libs/libcast.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local L = ShaguTweaks.L local GetExpansion = ShaguTweaks.GetExpansion local libtipscan = ShaguTweaks.libtipscan diff --git a/libs/libdebuff.lua b/libs/libdebuff.lua index d810ca6..8e77c51 100644 --- a/libs/libdebuff.lua +++ b/libs/libdebuff.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local L = ShaguTweaks.L local GetExpansion = ShaguTweaks.GetExpansion local libtipscan = ShaguTweaks.libtipscan diff --git a/libs/libhealth.lua b/libs/libhealth.lua index 83f2bcd..df89876 100644 --- a/libs/libhealth.lua +++ b/libs/libhealth.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local L = ShaguTweaks.L local GetExpansion = ShaguTweaks.GetExpansion diff --git a/libs/libnameplate.lua b/libs/libnameplate.lua index c5d8fd5..fd316b6 100644 --- a/libs/libnameplate.lua +++ b/libs/libnameplate.lua @@ -1,4 +1,4 @@ -local _G = _G or getfenv(0) +local _G = ShaguTweaks.GetGlobalEnv() local GetExpansion = ShaguTweaks.GetExpansion local GetUnitData = ShaguTweaks.GetUnitData diff --git a/libs/libpredict.lua b/libs/libpredict.lua index 17ea202..d9efdfb 100644 --- a/libs/libpredict.lua +++ b/libs/libpredict.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local L = ShaguTweaks.L local GetExpansion = ShaguTweaks.GetExpansion local libtipscan = ShaguTweaks.libtipscan diff --git a/libs/libspell.lua b/libs/libspell.lua index 197db98..81eaa01 100644 --- a/libs/libspell.lua +++ b/libs/libspell.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local GetExpansion = ShaguTweaks.GetExpansion local libtipscan = ShaguTweaks.libtipscan local hooksecurefunc = ShaguTweaks.hooksecurefunc diff --git a/libs/libtipscan.lua b/libs/libtipscan.lua index 944a319..e7cb558 100644 --- a/libs/libtipscan.lua +++ b/libs/libtipscan.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local libtipscan = {} local baseName = "ShaguTweaksTooltip" local methods = { diff --git a/libs/libunitscan.lua b/libs/libunitscan.lua index 4c53776..a819181 100644 --- a/libs/libunitscan.lua +++ b/libs/libunitscan.lua @@ -1,5 +1,4 @@ -local _G = _G or getfenv(0) - +local _G = ShaguTweaks.GetGlobalEnv() local GetExpansion = ShaguTweaks.GetExpansion local L = ShaguTweaks.L