summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-02-03 14:09:58 -0200
committershennetsind <ind@henn.et>2014-02-03 14:09:58 -0200
commit50bc76c412b6618d90fdbdb24d43da2bda0525a2 (patch)
treea98a1b4cd9aaa335b3361f2ef5cd7081b7469df2 /src/common
parent9132878d911cfe720eaad94ad3d4a5dd11958f99 (diff)
downloadhercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.tar.gz
hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.tar.bz2
hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.tar.xz
hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.zip
Fixed Bug 7333
Zones are now able to merge during runtime. Special Thanks to Haru, kyeme. http://hercules.ws/board/tracker/issue-7333-map-zone-db/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/HPM.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/common/HPM.c b/src/common/HPM.c
index cf296e593..bd2ce93ab 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -217,7 +217,7 @@ struct hplugin *hplugin_load(const char* filename) {
return NULL;
}
- if( !HPM->DataCheck(HPMDataCheck,*HPMDataCheckLen,plugin->info->name) ) {
+ if( HPM->DataCheck && !HPM->DataCheck(HPMDataCheck,*HPMDataCheckLen,plugin->info->name) ) {
ShowWarning("HPM:plugin_load: '"CL_WHITE"%s"CL_RESET"' failed DataCheck, out of sync from the core (recompile plugin), skipping...\n", filename);
HPM->unload(plugin);
return NULL;
@@ -275,10 +275,11 @@ void hplugins_config_read(void) {
const char *config_filename = "conf/plugins.conf"; // FIXME hardcoded name
FILE *fp;
- if( !HPM->DataCheck ) {
- ShowError("HPM:config_read: HPM->DataCheck not set! Failure\n");
- return;
- }
+// uncomment once login/char support is wrapped up
+// if( !HPM->DataCheck ) {
+// ShowError("HPM:config_read: HPM->DataCheck not set! Failure\n");
+// return;
+// }
/* yes its ugly, its temporary and will be gone as soon as the new inter-server.conf is set */
if( (fp = fopen("conf/import/plugins.conf","r")) ) {