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.

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

合并到官方~~~~https://github.com/Arkania/ArkCORE-4.3.4/ #2

Open
wants to merge 135 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
4fc23d4
Core/Spells: Fill SpellInfo files.
Jul 8, 2012
4396efe
remove some code.
Jul 8, 2012
37503bc
some fixes.
Jul 9, 2012
78aaf4a
Merge branch 'master' of github.com:Arkania/ArkCORE into spellinfo
Jul 12, 2012
58a5a74
Update spellmgr.
Jul 12, 2012
91de2ab
Merge branch 'master' of github.com:Arkania/ArkCORE into spellinfo
Jul 12, 2012
cdfe9b1
copyright fixes.
Jul 12, 2012
dbe54be
use SpellInfo in h files.
Jul 12, 2012
11a2dfd
more spellinfo changes.
Jul 12, 2012
f721e54
more spellinfo changes.
Jul 12, 2012
8284591
more fixes.
Jul 12, 2012
0d566ac
more fixes.
Jul 13, 2012
02df0ab
DB/Misc: Already applied on 3.7.0
Jul 14, 2012
377c719
DB/SAI: few scripts added
cooler-SAI Jul 14, 2012
dd48494
sql typo
wazy Jul 15, 2012
5369f58
DB/Base: Update sql with recent updates.
Jul 16, 2012
4da7116
remove unnedded inserts.
Jul 16, 2012
bc7fe45
Core/Guild: CRASH FOR SURE!: reverted some commits.
Jul 16, 2012
9d4b19f
Core/Player:
Jul 16, 2012
5ba4ae8
Merge branch 'master' of github.com:Arkania/ArkCORE into spellinfo
Jul 17, 2012
54555ff
Core/Spells:
Jul 17, 2012
b5c216a
Spellinfo: fixed more errors.
Jul 17, 2012
8069728
missing include.
Jul 17, 2012
5a363fc
more fixes.
Jul 17, 2012
3bde711
DB/SAI: added new scripts for Tanaris location
cooler-SAI Jul 17, 2012
c524fa3
Core/Guild: Adjustments.
Jul 17, 2012
8d46554
typo fix ,thanks to @maxsoon
cooler-SAI Jul 18, 2012
4322cd6
DB/SAI: more scripts for Tanaris
cooler-SAI Jul 18, 2012
2957f19
Core/Spells: Fixed some errors.
Jul 18, 2012
66fb7e6
Core/Spells: Fixed more errors.
Jul 18, 2012
c6ade8f
Core/Spells: Fixed more errors.
Jul 18, 2012
4563936
Core/Spells: Fixed more errors.
Jul 18, 2012
d0e9f0e
Merge branch 'master' of github.com:Arkania/ArkCORE
Jul 18, 2012
1bdd5a2
Merge branch 'master' of github.com:Arkania/ArkCORE into spellinfo
Jul 18, 2012
b9e61d7
fixed more errors.
Jul 18, 2012
8cd5559
more error fixes.
Jul 18, 2012
61d8ec9
CORE/GuildMgr Fix Error syntax
Jul 19, 2012
556dca1
CORE/Spell Unholy Presence
Jul 19, 2012
3c0a961
some fixes.
Jul 19, 2012
d768009
SQL/Smart_Script Fix error consol
Jul 19, 2012
2206fd3
Fixed more errors. 500 left.
Jul 19, 2012
cdc26e8
DB/smart_scripts Fix error console
Jul 19, 2012
9220d85
more spellinfo fixes.
Jul 19, 2012
995c5f2
CORE/Spell Fix error presence Thanks: LuisK
Jul 19, 2012
574a2b0
CORE/Spell Frost Presence
Jul 20, 2012
318aa65
DB/spell_script_names Aspect_of_the_hawk
Jul 20, 2012
297e640
DB/spell_script_names Fix error consol
Jul 20, 2012
dbdfd35
CORE/Boss professor_putricide Fix error consol.
Jul 20, 2012
dbc6bfa
CORE/Spell Mage Fix error consol
Jul 20, 2012
530cd2b
more errors fixed... 300 left.
Jul 20, 2012
64d130d
CORE/Spell Warlock fix error consol
Jul 20, 2012
b2ebb2f
DB/SAI: bigest script pack for Tanaris zone
cooler-SAI Jul 20, 2012
3e3a1bc
more error fixes.
Jul 20, 2012
b380e5f
more fixes.
Jul 21, 2012
e6b5ca0
fixes.
Jul 21, 2012
8a69bf0
235 errors.
Jul 21, 2012
cb2822f
fixed more errors.
Jul 21, 2012
780ca93
improvements.
Jul 21, 2012
df86503
more spellinfo fixes.
Jul 21, 2012
8f6ac7d
more errors fixed.
Jul 21, 2012
b12ffc2
more fixes.
Jul 21, 2012
195b985
typo fix, thanks to @Zeuh
cooler-SAI Jul 21, 2012
d5bd4ad
Core/Guild: More guild fixes.
Jul 21, 2012
ff3fdd9
Guilds: More improvements.
Jul 22, 2012
5bb0dcd
Merge branch 'master' of git://github.com/Arkania/ArkCORE
Jul 22, 2012
0806be3
Merge branch 'guilds' of git://github.com/Arkania/ArkCORE
Jul 22, 2012
a11ac43
Merge branch 'spellinfo' of git://github.com/Arkania/ArkCORE
Jul 22, 2012
2ca7ad6
errors fixes.
Jul 22, 2012
474f048
fixed compile errors.
Jul 22, 2012
966f110
fixes...
Jul 22, 2012
f416608
some more updates.
Jul 23, 2012
d3ed612
packetlog updates.
Jul 23, 2012
9a0cc26
pushed more packetlog stuff.
Jul 23, 2012
7139522
.
Jul 23, 2012
2d3d00a
Core/Add News Dungeon & Raids
Oracraft Jul 23, 2012
e5240f5
Core/Dungeon Zul-Gurub - delete old boss and add new boss
Oracraft Jul 23, 2012
d5176fb
Core/Dungeon Zul'Aman Delete old boss add new boss
Oracraft Jul 23, 2012
368247a
Core/Raid Add FireLands
Oracraft Jul 23, 2012
392fff5
More PacketLog changes
Jul 23, 2012
e8b47a1
Merge branch 'master' of github.com:Arkania/ArkCORE-4.3.4
Jul 23, 2012
3df07d3
Fixed a typo from last commit
Jul 23, 2012
6a538f9
Add new files
Jul 23, 2012
4e1b79f
implemented new way for updatefieldflags, thx shauren.
Jul 23, 2012
0233667
Core/Script Raid FireLands
Oracraft Jul 23, 2012
0a18762
Change copyright
Oracraft Jul 23, 2012
c8ce250
Change real copyright
Jul 23, 2012
98f5ee3
Readme Update version
Oracraft Jul 23, 2012
5bed77c
error fixes.
Jul 23, 2012
cacb697
Merge branch 'master' of github.com:Arkania/ArkCORE-4.3.4
Jul 23, 2012
817c4f1
more error fixes.
Jul 23, 2012
65726b4
more errors fixes.
Jul 23, 2012
c8b90c1
Add missing code, thanks wlasser.
Jul 23, 2012
529dad8
remove useless todo now.
Jul 23, 2012
78c3db9
typo
Jul 24, 2012
198367e
Update Auth for build 4.3.4 15595
Jul 24, 2012
223948e
Fix multi-folder part.I
Jul 24, 2012
e74b271
Fix multi folder part.II
Jul 24, 2012
01ea7db
Merge pull request #1 from kraven5/master
Jul 24, 2012
b5b0893
now add SetOwnerGUID to correct repo xD
Jul 24, 2012
24f590c
Spell.cpp error fixes.
Jul 24, 2012
45571c5
Spell.cpp is done, next is SpellEffects.cpp.
Jul 24, 2012
d8ea228
127 errors :D
Jul 24, 2012
d7d343b
add g3d includes to cmake.
Jul 24, 2012
b3ddde6
old movement system will replaced with splines system :)
Jul 24, 2012
0a0687e
98 errors.
Jul 24, 2012
197e368
update updatefields.
Jul 24, 2012
24f841b
62 errors.
Jul 24, 2012
359ecba
All SpellInfo errros fixed!!!
Jul 24, 2012
d1d096f
Re-enable anticheat check.
Jul 24, 2012
55afe1e
Fixed linker errors.
Jul 25, 2012
8d2ebe5
First changes for new spline system
Jul 25, 2012
b4ca69f
Second change ...
Jul 25, 2012
afddadf
First changes for new spline system
Jul 25, 2012
0c5e918
Rewrite BuildMovementUpdate for 4.3.4, with new spline system support…
Jul 25, 2012
979005e
more change ...
Jul 25, 2012
fc00b77
Core/Vehicles: Store guids in vehicleseat structures instead of point…
Jul 26, 2012
0c7712d
Core/Vehicles: Make vehicles with UNIT_FLAG_DISABLE_MOVE unable to mo…
Jul 26, 2012
c4d429b
More vehicle changes
Jul 26, 2012
2de568b
add new fields to vehicle_accessory.
Jul 26, 2012
da984e7
vehcile.
Jul 26, 2012
08ac94f
More vehicle changes 2
Jul 26, 2012
32857d8
refactor vehicle handling
Jul 26, 2012
491be8e
Core/Vehicles: Correct usage of npc_spellclick_spells instead of blat…
Jul 26, 2012
45ea784
refactor vehicle handling 2
Jul 26, 2012
e681025
more vehicle changes... no is not compileable.
Jul 26, 2012
efa53aa
remove duplicate functions.
Jul 26, 2012
5a66532
Fix some errors.
Jul 26, 2012
8c527e9
some compile bugs fixed.
Jul 26, 2012
5f22b48
more fixes.
Jul 27, 2012
eb5056b
more spline changes.
Jul 27, 2012
b77952c
rewrite movementgenerators.
Jul 27, 2012
2f0a2d9
rewrite rest of movement generator handlers... todo: waypointmvg.
Jul 27, 2012
cb8035a
fix some erros and disable scripts by default.
Jul 28, 2012
0ccb27b
Merged with TC
Oct 22, 2012
4748fe9
ADD Boss_ :
Oracraft Nov 12, 2012
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
Fixed linker errors.
  • Loading branch information
Venugh committed Jul 25, 2012
commit 55afe1e404c5d5c6b8509e6abe9a256d09755b8a
1 change: 1 addition & 0 deletions src/server/game/Handlers/MovementHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "MovementStructures.h"
#include "InstanceSaveMgr.h"
#include "ObjectMgr.h"
#include <G3D/Matrix4.h>

void WorldSession::HandleMoveWorldportAckOpcode (WorldPacket & /*recv_data*/)
{
Expand Down
18 changes: 0 additions & 18 deletions src/server/game/Scripting/ScriptLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,12 @@ void AddSC_uldaman();
void AddSC_instance_uldaman();
void AddSC_boss_akilzon();//Zul'Aman
void AddSC_boss_halazzi();
void AddSC_boss_hex_lord_malacrass();
void AddSC_boss_janalai();
void AddSC_boss_nalorakk();
void AddSC_boss_zuljin();
void AddSC_instance_zulaman();
void AddSC_zulaman();
void AddSC_boss_jeklik();//Zul'Gurub
void AddSC_boss_venoxis();
void AddSC_boss_marli();
void AddSC_boss_mandokir();
void AddSC_boss_gahzranka();
void AddSC_boss_thekal();
void AddSC_boss_arlokk();
void AddSC_boss_jindo();
void AddSC_boss_hakkar();
void AddSC_boss_grilek();
void AddSC_boss_hazzarah();
void AddSC_boss_renataki();
Expand Down Expand Up @@ -904,21 +895,12 @@ void AddEasternKingdomsScripts ()
AddSC_instance_uldaman();
AddSC_boss_akilzon();//Zul'Aman
AddSC_boss_halazzi();
AddSC_boss_hex_lord_malacrass();
AddSC_boss_janalai();
AddSC_boss_nalorakk();
AddSC_boss_zuljin();
AddSC_instance_zulaman();
AddSC_zulaman();
AddSC_boss_jeklik();//Zul'Gurub
AddSC_boss_venoxis();
AddSC_boss_marli();
AddSC_boss_mandokir();
AddSC_boss_gahzranka();
AddSC_boss_thekal();
AddSC_boss_arlokk();
AddSC_boss_jindo();
AddSC_boss_hakkar();
AddSC_boss_grilek();
AddSC_boss_hazzarah();
AddSC_boss_renataki();
Expand Down
32 changes: 23 additions & 9 deletions src/server/game/Server/WorldSession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
bool MapSessionFilter::Process (WorldPacket *packet)
{
Opcodes opcode = DropHighBytes(packet->GetOpcode());
const OpcodeHandler* opHandle = opcodeTable[opcode];
OpcodeHandler const* opHandle = opcodeTable[opcode];
//let's check if our opcode can be really processed in Map::Update()
if (opHandle->packetProcessing == PROCESS_INPLACE)
return true;
Expand All @@ -75,7 +75,7 @@ bool MapSessionFilter::Process (WorldPacket *packet)
bool WorldSessionFilter::Process (WorldPacket *packet)
{
Opcodes opcode = DropHighBytes(packet->GetOpcode());
const OpcodeHandler* opHandle = opcodeTable[opcode];
OpcodeHandler const* opHandle = opcodeTable[opcode];
//check if packet handler is supposed to be safe
if (opHandle->packetProcessing == PROCESS_INPLACE)
return true;
Expand Down Expand Up @@ -145,15 +145,19 @@ void WorldSession::SendPacket (WorldPacket const* packet)
{
if (!m_Socket)
return;
if (sWorld->debugOpcode != 0 && packet->GetOpcode() != sWorld->debugOpcode)
return;

if (packet->GetOpcode() == NULL_OPCODE || packet->GetOpcode() == UNKNOWN_OPCODE)
{
sLog->outError("Prevented sending of %s", packet->GetOpcode() == NULL_OPCODE ? "NULL_OPCODE" : "UNKNOWN_OPCODE");
return;
}

if (!opcodeTable[packet->GetOpcode()])
{
sLog->outError("Prevented sending disabled opcode %d (hex 0x%04X)", packet->GetOpcode(), packet->GetOpcode());
return;
}

#ifdef ARKCORE_DEBUG

// Code for network use statistic
Expand Down Expand Up @@ -563,8 +567,11 @@ void WorldSession::SendNotification (const char *format, ...)
vsnprintf(szStr, 1024, format, ap);
va_end(ap);

WorldPacket data(SMSG_NOTIFICATION, (strlen(szStr) + 1));
data << szStr;
size_t len = strlen(szStr);
WorldPacket data(SMSG_NOTIFICATION, 2 + len);
data.WriteBits(len, 13);
data.FlushBits();
data.append(szStr, len);
SendPacket(&data);
}
}
Expand All @@ -581,8 +588,11 @@ void WorldSession::SendNotification (uint32 string_id, ...)
vsnprintf(szStr, 1024, format, ap);
va_end(ap);

WorldPacket data(SMSG_NOTIFICATION, (strlen(szStr) + 1));
data << szStr;
size_t len = strlen(szStr);
WorldPacket data(SMSG_NOTIFICATION, 2 + len);
data.WriteBits(len, 13);
data.FlushBits();
data.append(szStr, len);
SendPacket(&data);
}
}
Expand Down Expand Up @@ -617,15 +627,19 @@ void WorldSession::SendAuthWaitQue (uint32 position)
if (position == 0)
{
WorldPacket packet(SMSG_AUTH_RESPONSE, 1);
packet.WriteBit(0); // has queue info
packet.WriteBit(0); // has account info
packet << uint8(AUTH_OK);
SendPacket(&packet);
}
else
{
WorldPacket packet(SMSG_AUTH_RESPONSE, 6);
packet.WriteBit(1); // has queue info
packet.WriteBit(0); // unk queue bool
packet.WriteBit(0); // has account info
packet << uint8(AUTH_WAIT_QUEUE);
packet << uint32(position);
packet << uint8(0); // unk
SendPacket(&packet);
}
}
Expand Down