Merge vanilla server changes from latest binary into NPC.

Pryaxis / TSAPI

🛠🌳 The TShock Scaffold API enables developers to build plugins that hook directly into the Terraria game engine.

http://tshock.co/

GNU General Public License v3.0

109 stars 66 forks source link

Merge vanilla server changes from latest binary into NPC. #106

Closed DogooFalchion closed 8 years ago

DogooFalchion commented 8 years ago

I went through a decompiled version of NPC and looked for any missing merges. There are a few missing NPC names, some mob balance changes, and some other random changes to logic. This also includes logic that checks for the issues reported in and fixes #105, and fixes NyxStudios/TShock#1311

Ijwu commented 8 years ago

LGTM but...

@Patrikkk @ProfessorXZ You're the most familiar with the recent decompiles. Please check this for me as well.

Thanks very much for the PR, btw!

ivanbiljan commented 8 years ago

@Ijwu It's good.

Patrikkk-zz commented 8 years ago

lgtm mate 👍 thank you for the contribution :) @DogooFalchion

Ijwu commented 8 years ago

Alright, thanks for the input guys. I'm going to leave this PR to be merged by another NyxStudios member due to the fact that it hasn't been compiled and run by any of us. I'm just introducing another level of oversight.

dark22 commented 8 years ago

Hello, testing in a clean server, these changes seem to have Tower NPCs disappear when there are no nearby players. I did some tests and the previous build and works correctly without this problem.

DogooFalchion commented 8 years ago

You say works correctly, but are you comparing this to a previously broken tshock build or vanilla terraria? There are a few lines that were changed from the previous version that appear to be related to being near/interacting with certain npcs. It might be the intended vanilla behavior.