jaylittle

Okay and for my last post in this thread for awhile (about to leave on a trip), I've updated the patch so that it cleanly patches 9648 with no offsets (fuzz wasn't an issue this time): http://www.jaylittle.com/jaylittle/downloads/auctionhousebot_005d.zip

Okay I've tweaked it so the patch will apply with no fuzz and no offsets to 9645 now: http://www.jaylittle.com/jaylittle/downloads/auctionhousebot_005c.zip Here is the patch output: $ patch -p1 --dry-run -F0 < ../../auctionhousebot_005c.patch patching file README.AHBOT patching file sql/characters_auctionhousebot.sql patching file sql/characters_auctionhousebot_update.sql patching file src/game/AuctionHouseBot.cpp patching file src/game/AuctionHouseBot.h patching file src/game/AuctionHouseHandler.cpp patching file src/game/AuctionHouseMgr.cpp patching file src/game/AuctionHouseMgr.h patching file src/game/Chat.cpp patching file src/game/Chat.h patching file src/game/Level3.cpp patching file src/game/Mail.cpp patching file src/game/Makefile.am patching file src/game/Player.cpp patching file src/game/Player.h patching file src/game/World.cpp patching file src/mangosd/mangosd.conf.dist.in patching file win/VC100/game.vcxproj patching file win/VC80/game.vcproj patching file win/VC90/game.vcproj Hope this helps!

Also worth noting - if I run patch with a fuzz factor of 0, here is the output I get instead: $ patch -p1 --dry-run -F0 < ../../auctionhousebot_005b.patch patching file README.AHBOT patching file sql/characters_auctionhousebot.sql patching file sql/characters_auctionhousebot_update.sql patching file src/game/AuctionHouseBot.cpp patching file src/game/AuctionHouseBot.h patching file src/game/AuctionHouseHandler.cpp Hunk #1 FAILED at 27. Hunk #2 succeeded at 122 (offset 1 line). Hunk #3 succeeded at 255 (offset 1 line). Hunk #4 succeeded at 270 (offset 1 line). 1 out of 4 hunks FAILED -- saving rejects to file src/game/AuctionHouseHandler.c pp.rej patching file src/game/AuctionHouseMgr.cpp Hunk #1 succeeded at 462 (offset -1 lines). patching file src/game/AuctionHouseMgr.h patching file src/game/Chat.cpp patching file src/game/Chat.h Hunk #1 succeeded at 107 (offset 3 lines). patching file src/game/Level3.cpp Hunk #1 succeeded at 52 (offset 1 line). patching file src/game/Mail.cpp Hunk #2 succeeded at 1022 (offset 13 lines). Hunk #3 FAILED at 1043. 1 out of 3 hunks FAILED -- saving rejects to file src/game/Mail.cpp.rej patching file src/game/Makefile.am patching file src/game/Player.cpp Hunk #1 succeeded at 14508 (offset 81 lines). patching file src/game/Player.h Hunk #1 succeeded at 1413 (offset -6 lines). patching file src/game/World.cpp Hunk #2 succeeded at 1275 (offset 2 lines). Hunk #3 succeeded at 1350 (offset 2 lines). patching file src/mangosd/mangosd.conf.dist.in Hunk #1 succeeded at 1362 (offset 13 lines). patching file win/VC100/game.vcxproj Hunk #2 succeeded at 499 (offset 1 line). patching file win/VC80/game.vcproj patching file win/VC90/game.vcproj

Well it works because I created it I use the --binary switch because otherwise the version of patch.exe I use on Windows crashes. If I use the cygwin version (which doesn't have this problem) - I get the following output when I attempt to patch a clean extract of the 9645 source tree: $ patch -p1 --dry-run < ../../auctionhousebot_005b.patch patching file README.AHBOT patching file sql/characters_auctionhousebot.sql patching file sql/characters_auctionhousebot_update.sql patching file src/game/AuctionHouseBot.cpp patching file src/game/AuctionHouseBot.h patching file src/game/AuctionHouseHandler.cpp Hunk #1 succeeded at 28 with fuzz 2 (offset 1 line). Hunk #2 succeeded at 122 (offset 1 line). Hunk #3 succeeded at 255 (offset 1 line). Hunk #4 succeeded at 270 (offset 1 line). patching file src/game/AuctionHouseMgr.cpp Hunk #1 succeeded at 462 (offset -1 lines). patching file src/game/AuctionHouseMgr.h patching file src/game/Chat.cpp patching file src/game/Chat.h Hunk #1 succeeded at 107 (offset 3 lines). patching file src/game/Level3.cpp Hunk #1 succeeded at 52 (offset 1 line). patching file src/game/Mail.cpp Hunk #2 succeeded at 1022 (offset 13 lines). Hunk #3 succeeded at 1043 with fuzz 1 (offset 13 lines). patching file src/game/Makefile.am patching file src/game/Player.cpp Hunk #1 succeeded at 14508 (offset 81 lines). patching file src/game/Player.h Hunk #1 succeeded at 1413 (offset -6 lines). patching file src/game/World.cpp Hunk #2 succeeded at 1275 (offset 2 lines). Hunk #3 succeeded at 1350 (offset 2 lines). patching file src/mangosd/mangosd.conf.dist.in Hunk #1 succeeded at 1362 (offset 13 lines). patching file win/VC100/game.vcxproj Hunk #2 succeeded at 499 (offset 1 line). patching file win/VC80/game.vcproj patching file win/VC90/game.vcproj

Odd. The difference here probably has something to do with the fact that I am applying the patch in windows using a windows version of patch.exe and running it using the following command: patch -p1 --binary < ..\\auctionhousebot_005b.patch Perhaps git apply --check does something a bit different and more stringent. When I apply the patch - I get a number of messages regarding offsets for the specific positions - so while the patch will apply with some fuzzy matching, it may be that by default git is requiring a specific positioning match rather than allowing a fuzzy match. Make no mistake, the file I posted is a "patch jockey" job

I have finished using the mods listed above along with my own personal mods over the last few weeks updating my patch for AHBot. This patch applies and compiles cleanly against 9645. I'm running the server so far and it appears to work. It includes the Minimal DB Load mod listed above as well. The zipped up patch can be downloaded from the link below. I hope this helps somebody. http://www.jaylittle.com/jaylittle/downloads/auctionhousebot_005b.zip