[SOLVED] Once again compilation error

[Arius]

Well since last time I've compiled TC few times without a problem. This time I was making new professions so there were few changes in scriptis. When I try to compilate it I get some kind of weird error which seems isn't even connected with changes which I made, anyway here's ss http://scr.hu/3zj7/7un0g

 

[Rochet2]

We need more than just a picture of the error.
Can you send the code around the part where the error happens?
Can you try for example check in git for all changes you have done, possibly to worldsession and elsewhere that could matter? (accidental edits?)

 

[Arius]

Well, sorry for late response. I didn't even really opened WorldSession.cpp. And I'm not pretty sure which part of code you need. So I'll just give part which might be one you're looking for: http://paste.emudevs.com/?paste=222 I can upload entire WorldSession if needed. I'm sorry I just don't know much about it

 

[Rochet2]

You tried merging and there were conflicts.
Then git requested you to make manual edits to fix the conflicts but you didnt.

[COLOR="#FF0000"]<<<<<<< HEAD[/COLOR]
                        sScriptMgr->OnPacketReceive(this, *packet);
#ifdef ELUNA
                        if (!sEluna->OnPacketReceive(this, *packet))
                            break;
#endif
                        (this->*opHandle.handler)(*packet);
                        LogUnprocessedTail(packet);
[COLOR="#FF0000"]=======[/COLOR]
                        if (AntiDOS.EvaluateOpcode(*packet, currentTime))
                        {
                            sScriptMgr->OnPacketReceive(this, *packet);
                            (this->*opHandle.handler)(*packet);
                            LogUnprocessedTail(packet);
                        }
[COLOR="#FF0000"]>>>>>>> c3a307825a457388697824dbd9b38dd7abadd7eb[/COLOR]

This is a part of the WorldSession.cpp code you pasted.
It means that this part was edited by both Eluna and TC and git cant automatically merge the 2 changes to same place.
You need to manually edit the code to fix how the code should be like.

You should have the core from our repo and not merge it with the latest TrinityCore - unless you know what you are doing.
This way you wont run into Eluna compile errors.

If you try to update to latest TC, you will run into problems with the code changes that TC does. You should be able to fix them yourself.
We will merge eventually and fix the errors - but we cant individually fix everyone's merge errors like this

 

[Arius]

Well. I'm not really sure what should I do. I wasn't even trying to update anything last time, just recompiled as always, and get this type of error. And well I'm using core from your repo and I wasn't really merging Eluna with TC. I just used your repo, uh.

 

[Rochet2]

Well, you clearly did do something.
As you can see, there is no such thing on our repository: https://github.com/ElunaLuaEngine/E.../src/server/game/Server/WorldSession.cpp#L268

Which means you likely tried merging or similar or swapped some files etc (do note that git pull does this)

You could try reclone the repository or you could checkout the file that errors (git checkout src/server/game/Server/WorldSession.cpp)
Checking out will reset the file to what is in the repo.

Make sure your git doesnt say its "merging" or similar

 

[Arius]

Well now it reminds me that I was merging your DressNPC patch. And command git checkout src/server/game/Server/WorldSession.cpp gives me: "error: path 'src/server/game/Server/WorldSession.cpp' is unmerged"

 

[Rochet2]

How about you do git status and post what it says here.