1.6.5更新，修复explode的fire参数失效问题

twoone-3 · Aug 8, 2021 · bead89a · bead89a
1 parent 52aece3
commit bead89a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/BDSpyrunner/BDSpyrunner.vcxproj b/BDSpyrunner/BDSpyrunner.vcxproj
@@ -29,7 +29,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="json.hpp" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/BDSpyrunner/BDSpyrunner.vcxproj.filters b/BDSpyrunner/BDSpyrunner.vcxproj.filters
@@ -31,9 +31,6 @@
     <ClInclude Include="pch.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="json.hpp">
-      <Filter>头文件</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />

diff --git a/BDSpyrunner/mod.cpp b/BDSpyrunner/mod.cpp
@@ -1599,7 +1599,7 @@ static PyObject* PyAPI_explode(PyObject*, PyObject* args) {
 		BlockSource* bs = _level->getBlockSource(did);
 		if (!bs)
 			Py_RETURN_ERROR("Unknown dimension ID");
-		onLevelExplode::original(_level, bs, nullptr, pos, power, true, destroy, range, true);
+		onLevelExplode::original(_level, bs, nullptr, pos, power, fire, destroy, range, true);
 	}
 	Py_RETURN_NONE;
 }
@@ -1649,7 +1649,9 @@ void init() {
 	if (!exists(PLUGIN_PATH))
 		create_directories(PLUGIN_PATH);
 	//将plugins/py加入模块搜索路径
-	Py_SetPath((PLUGIN_PATH L";" + wstring(Py_GetPath())).c_str());
+	wstring py_path(PLUGIN_PATH L";");
+	py_path += Py_GetPath();
+	Py_SetPath(py_path.c_str());
 #pragma region 预初始化3.8+
 	//PyPreConfig cfg;
 	//PyPreConfig_InitPythonConfig(&cfg);
@@ -1667,7 +1669,7 @@ void init() {
 		if (path.extension() == ".py" || path.extension() == ".pyd") {
 			const string& name = path.stem().u8string();
 			INFO("loading " << name);
-			PyImport_ImportModule(name.c_str());
+			PyImport_Import(PyUnicode_FromStringAndSize(name.c_str(), name.length()));
 			PyErr_Print();
 		}
 	}

diff --git a/BDSpyrunner/pch.h b/BDSpyrunner/pch.h
@@ -22,7 +22,6 @@ using std::map;
 using std::unordered_map;
 using std::function;
 using std::unique_ptr;
-using std::exception;
 using std::ostream;
 using std::cout;
 using std::cerr;
@@ -71,14 +70,14 @@ constexpr size_t Hash(const char* s) {
 	unsigned h = 0;
 	for (; *s; ++s)
 		h = 5 * h + *s;
-	return size_t(h);
+	return static_cast<size_t>(h);
 }
 //转换字符串为json
 static json StringtoJson(string_view str) {
 	try {
 		return json::parse(str);
 	}
-	catch (const exception& e) {
+	catch (const json::exception& e) {
 		ERR(e.what());
 		return nullptr;
 	}