Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

2026-09-04 22:56:37 +00:00 · 2020-05-23 22:33:34 -05:00
parent d8b9c3e3de 86ef1b12e2
commit 3f62da4573
225 changed files with 7700 additions and 6657 deletions
@@ -137,7 +137,7 @@ public:

 	const char *GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location);

-	EQEmu::Random random;
+	EQ::Random random;
 	EQTime        zone_time;

 	ZonePoint *GetClosestZonePoint(const glm::vec3 &location, const char *to_name, Client *client, float max_distance = 40000.0f);