aboutsummaryrefslogtreecommitdiff
path: root/src/trinitycore/Master.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-08 12:25:20 -0500
committermegamage <none@none>2009-08-08 12:25:20 -0500
commit58dc6e180bf88cc62a4bdff403b54c2cf9eba995 (patch)
tree3c0dd962d82dc294da0fca02fc0612e1febf20f9 /src/trinitycore/Master.cpp
parentf8a05d264f77f366bf9f367dc5c59262c190c017 (diff)
[8320] Imporovements in wild summoned gameobjects work. Author: VladimirMangos
* Not set owner for will summoned gameobjects. Its not expected to have owner, and must be accessable to all players (or team). * Set for all objects summoned by spells: despawned by deafult for proper despawn withut owner. * Cleanup Spell::EffectSummonObjectWild. --HG-- branch : trunk
Diffstat (limited to 'src/trinitycore/Master.cpp')
-rw-r--r--src/trinitycore/Master.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index 7e48b97eb4f..b9bf375628b 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -317,13 +317,8 @@ int Master::Run()
{
FreezeDetectorRunnable *fdr = new FreezeDetectorRunnable();
fdr->SetDelayTime(freeze_delay*1000);
-<<<<<<< HEAD:src/mangosd/Master.cpp
- ACE_Based::Thread t(*fdr);
- t.setPriority(ACE_Based::High);
-=======
ACE_Based::Thread t(fdr);
t.setPriority(ACE_Based::Highest);
->>>>>>> ca55c2a9d069aaef0d3deafb4884bfd8d3884444:src/mangosd/Master.cpp
}
///- Launch the world listener socket