Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(Core) Dynamic Creature/GameObject #14893

Closed
wants to merge 46 commits into from
Closed

feat(Core) Dynamic Creature/GameObject #14893

Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
5d6b19a
temp
Feb 6, 2023
70c5e8b
new fixes
Feb 6, 2023
57dfd72
new fixes
Feb 7, 2023
3c48e97
final core fixes
Feb 7, 2023
185c05a
other fixes
Feb 7, 2023
c260041
New builds fixes & Remove SAVE_RESPAWN_TIME_IMMEDIATELY
Feb 7, 2023
0460efc
fix builds compile with Create()
Feb 8, 2023
2810a38
fix build compile with GuidWarning() and GuidAlert()
Feb 8, 2023
86d8df0
new fixes
Feb 8, 2023
b2f0dad
final build fixes and codestyle
Feb 8, 2023
4d944b4
fix gcc/clang and cli build
Feb 8, 2023
7559239
try new fix
Feb 8, 2023
ddff700
fix build, important new modifications for cs_npc, and strings for dy…
Feb 8, 2023
b42411a
remove unused variable and _DespawnAtEvade()
Feb 8, 2023
5adeaeb
.
Feb 8, 2023
82a7e9e
simplify the method for now
Feb 8, 2023
1d52016
.
Feb 8, 2023
33526b5
.
Feb 8, 2023
44a5b30
missing WorldMock
Feb 9, 2023
38a3156
remove unused variable, and some other improvements
Feb 10, 2023
07634fd
fix id naming, and allow to keep 3 ids for creautres
Feb 10, 2023
917ba95
remove some sql lines waiting to implement new commands
Feb 10, 2023
07655af
import last change in commands and restore sql strings
Feb 10, 2023
a1834f6
.
Feb 10, 2023
adb7818
Revert "."
Feb 11, 2023
49611d3
try a new fix
Feb 11, 2023
717f606
Merge branch 'master' into dynamic-crea-go
Feb 11, 2023
69a3e5a
remove list respawn and fix codestyle
Feb 11, 2023
fa5cd8f
fix last commit
Feb 11, 2023
36d6e22
build fix
Feb 11, 2023
17f1a26
Merge branch 'dynamic-crea-go' of https://github.com/Maelthyrr/Person…
Feb 11, 2023
206bc29
codestyle
Feb 12, 2023
a57c42d
update from master branch
Feb 12, 2023
90cfc34
Merge branch 'azerothcore:master' into dynamic-crea-go
Feb 15, 2023
6d408cc
remove unused method
Feb 15, 2023
e6f1752
Merge branch 'dynamic-crea-go' of https://github.com/Maelthyrr/Person…
Feb 15, 2023
9aa8fe6
fix few LOG_ERROR in Creatures.cpp
Feb 15, 2023
87a5e16
Merge branch 'azerothcore:master' into dynamic-crea-go
Feb 21, 2023
ec5cbdd
Merge branch 'azerothcore:master' into dynamic-crea-go
Feb 26, 2023
97a46bb
already present in AC
Feb 26, 2023
4a2184e
use GetGameTime in CheckRespawn()
Feb 26, 2023
1bf4497
update from master
Mar 11, 2023
dfb9151
use ftm in some log
Mar 11, 2023
71cbc47
fix with last commit
Mar 11, 2023
ac5cb76
new fixes
Mar 11, 2023
e8e16e4
few restore changes and fix some other things
Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use GetGameTime in CheckRespawn()
  • Loading branch information
Maelthyrr committed Feb 26, 2023
commit 4a2184e208782b6fcc84ada1aa2ecf36da7814c6
2 changes: 1 addition & 1 deletion src/server/game/Maps/Map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2679,7 +2679,7 @@ bool Map::CheckRespawn(RespawnInfo* info)
ObjectGuid thisGUID = ObjectGuid((info->type == SPAWN_TYPE_GAMEOBJECT) ? HighGuid::GameObject : HighGuid::Unit, info->entry, info->spawnId);
if (time_t linkedTime = GetLinkedRespawnTime(thisGUID))
{
time_t now = time(NULL);
time_t now = GameTime::GetGameTime().count();
time_t respawnTime;
if (sObjectMgr->GetLinkedRespawnGuid(thisGUID) == thisGUID) // never respawn, save "something" in DB
respawnTime = now + WEEK;
Expand Down