Browse Source

add support for DB to override map values if the default -1000000.0 is overridden in the DB

Emagi 1 năm trước cách đây
mục cha
commit
eb69bd7357
1 tập tin đã thay đổi với 5 bổ sung1 xóa
  1. 5 1
      EQ2/source/WorldServer/client.cpp

+ 5 - 1
EQ2/source/WorldServer/client.cpp

@@ -3241,7 +3241,11 @@ bool Client::Process(bool zone_process) {
 			if(!underworld_cooldown_timer.Enabled() || (underworld_cooldown_timer.Enabled() && underworld_cooldown_timer.Check())) {
 				bool underworld = false;
 				if(rule_manager.GetGlobalRule(R_Zone, UseMapUnderworldCoords)->GetBool()) {
-					if(GetPlayer()->GetMap() && GetPlayer()->GetMap()->GetMinY() != 9999999.0f && GetPlayer()->GetY() < (GetPlayer()->GetMap()->GetMinY() + rule_manager.GetGlobalRule(R_Zone, MapUnderworldCoordOffset)->GetFloat())) {		
+					if(GetCurrentZone()->GetUnderWorld() != -1000000.0f) {
+						if(GetPlayer()->GetY() < GetCurrentZone()->GetUnderWorld())
+							underworld = true;
+					}
+					else if(GetPlayer()->GetMap() && GetPlayer()->GetMap()->GetMinY() != 9999999.0f && GetPlayer()->GetY() < (GetPlayer()->GetMap()->GetMinY() + rule_manager.GetGlobalRule(R_Zone, MapUnderworldCoordOffset)->GetFloat())) {		
 						underworld = true;
 					}
 				}