diff --git a/.gitignore b/.gitignore index 52dbcb224..da379ca18 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,8 @@ Build_64/ build_64/ log/ logs/ + +submodules/ +.idea/ +cmake-build-debug +EQEmu.cbp \ No newline at end of file diff --git a/zone/embperl.cpp b/zone/embperl.cpp index d881cad5e..d33de1887 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -247,8 +247,8 @@ void Embperl::init_eval_file(void) " return;" "} else {" //we 'my' $filename,$mtime,$package,$sub to prevent them from changing our state up here. - " eval(\"package $package; my(\\$filename,\\$mtime,\\$package,\\$sub); \\$isloaded = 1; require '$filename'; \");" -/* "local *FH;open FH, $filename or die \"open '$filename' $!\";" + " eval(\"package $package; my(\\$filename,\\$mtime,\\$package,\\$sub); \\$isloaded = 1; require './$filename'; \");" + /* "local *FH;open FH, $filename or die \"open '$filename' $!\";" "local($/) = undef;my $sub = ;close FH;" "my $eval = qq{package $package; sub handler { $sub; }};" "{ my($filename,$mtime,$package,$sub); eval $eval; }" diff --git a/zone/embxs.cpp b/zone/embxs.cpp index 5a4acc36d..df05ef468 100644 --- a/zone/embxs.cpp +++ b/zone/embxs.cpp @@ -99,6 +99,10 @@ XS(XS_EQEmuIO_PRINT) /* Strip newlines from log message 'str' */ *std::remove(str, str + strlen(str), '\n') = '\0'; + std::string log_string = str; + if (log_string.find("did not return a true") != std::string::npos) + return; + int i; int pos = 0; int len = 0;