修复mspt闪退,NCUD不能用以及实体系统更新时间无法测试的问题

bedrock-dev · Jul 26, 2021 · 68d959a · 68d959a
1 parent 144bca3
commit 68d959a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 54 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ target_include_directories(${MOD_API_NAME}
 target_link_libraries(${MOD_API_NAME} ${PROJECT_SOURCE_DIR}/api/lib/detours.lib)
 
 ####################这里是具体功能##########################
-set(TRAPDOOR_VERSION 0.9.6)
+set(TRAPDOOR_VERSION 0.9.6.1)
 set(MCBE_VERSION 1.17.10.04)
 set(BETA OFF)
 set(TEST_NUMBER 3)

diff --git a/api/Offset.h b/api/Offset.h
@@ -49,7 +49,7 @@ constexpr uint64_t DIMENSION_GET_CIRCUIT_SYSTEM = 0x21;
 
 constexpr uint64_t CIRCUIT_GET_GRAPH = 0x8;
 
-constexpr uint64_t DIMENSION_IS_RS_TICK = 0x45;
+constexpr uint64_t DIMENSION_IS_RS_TICK = 0x4B;
 //! Spawner::_spawnMobCluster
 constexpr uint64_t MOB_SPAWN_DATA_GET_RULE = 184;
 

diff --git a/api/world/Dimension.cpp b/api/world/Dimension.cpp
@@ -3,30 +3,32 @@
 //
 
 #include "Dimension.h"
-#include <cstdio>
-#include "tools/DirtyLogger.h"
 #include "Offset.h"
+#include "tools/DirtyLogger.h"
+#include <cstdio>
 namespace trapdoor {
 //打印维度上限，目前没屌用
-    void Dimension::printBaseTypeLimit() {
-        //from Spawner::_popCapAllows
-        char *dim = reinterpret_cast<char *>(this);
-        auto *surface = (float *) (dim + 80);
-        auto *underground = (float *) (dim + 108);
-        for (int i = 0; i < 7; i++) {
-            printf("%.3f    %.3f\n", surface[i], underground[i]);
-        }
+void Dimension::printBaseTypeLimit() {
+    // from Spawner::_popCapAllows
+    char *dim = reinterpret_cast<char *>(this);
+    auto *surface = (float *)(dim + 80);
+    auto *underground = (float *)(dim + 108);
+    for (int i = 0; i < 7; i++) {
+        printf("%.3f    %.3f\n", surface[i], underground[i]);
     }
+}
 
-    CircuitSceneGraph *Dimension::getGraph() {
-        //这种代码真的写的人瘆得慌
-        //!from Dimension::tickRedstone(Dimension *this)
-        uint64_t *circuitSystem = reinterpret_cast<uint64_t *>(this) + off::DIMENSION_GET_CIRCUIT_SYSTEM;
-        return reinterpret_cast<CircuitSceneGraph *> (*circuitSystem + off::CIRCUIT_GET_GRAPH);
-    }
+CircuitSceneGraph *Dimension::getGraph() {
+    //这种代码真的写的人瘆得慌
+    //! from Dimension::tickRedstone(Dimension *this)
+    uint64_t *circuitSystem =
+        reinterpret_cast<uint64_t *>(this) + off::DIMENSION_GET_CIRCUIT_SYSTEM;
+    return reinterpret_cast<CircuitSceneGraph *>(*circuitSystem +
+                                                 off::CIRCUIT_GET_GRAPH);
+}
 
-    bool Dimension::isRedstoneTick() {
-        //为1是红石刻2是非红石刻
-        return *((uint32_t *) this + off::DIMENSION_IS_RS_TICK) == 1;
-    }
+bool Dimension::isRedstoneTick() {
+    //为1是红石刻2是非红石刻
+    return *((uint32_t *)this + off::DIMENSION_IS_RS_TICK) == 1;
 }
+} // namespace trapdoor
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+# 1.17.1.01-0.9.6
+2021-07-26
+- 修复MSPT的概率性闪退
+- 修复NCUD无法使用的问题
+- 修复实体系统tick时间无法测试的问题
+
+
 # 1.17.1.01-0.9.6
 2021-07-14
 

diff --git a/mod/TrapdoorMod.cpp b/mod/TrapdoorMod.cpp
@@ -98,8 +98,7 @@ void TrapdoorMod::registerCommands() {
                    }))
 
         ->then(ARG("ncud", "command.func.ncud.desc", BOOL, {
-            FUNC_DISABLED(player)
-            return;
+            // FUNC_DISABLED(player)
             this->singleFunctions.preventNCUpdate = holder->getBool();
             info(player, LANG("command.func.ncud.set"), holder->getBool());
         }));

diff --git a/mod/function/SingleFunctions.cpp b/mod/function/SingleFunctions.cpp
@@ -2,40 +2,34 @@
 // Created by xhy on 2020/12/23.
 //
 
-#include "lib/mod.h"
-#include "lib/SymHook.h"
 #include "BDSMod.h"
 #include "TrapdoorMod.h"
+#include "lib/SymHook.h"
+#include "lib/mod.h"
 
 namespace mod {
-    using namespace SymHook;
-
-    THook(
-            void,
-            MSSYM_B1QA7explodeB1AA9ExplosionB2AAA7QEAAXXZ,
-            void * exp
-    ) {
-        auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
-        if (!modInstance->getSingFunction().preventExplosion)
-            original(exp);
-    }
+using namespace SymHook;
 
-    /**
-     *  SYM_CALL(
-                void(*)(BlockSource * self,const BlockPos *pos),
-                MSSYM_B1QE17updateNeighborsAtB1AE11BlockSourceB2AAE17QEAAXAEBVBlockPosB3AAAA1Z,
-                this, pos
-        );
-     */
+THook(void, MSSYM_B1QA7explodeB1AA9ExplosionB2AAA7QEAAXXZ, void *exp) {
+    auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
+    if (!modInstance->getSingFunction().preventExplosion)
+        original(exp);
+}
 
-    THook(
-            void,
+/**
+ *  SYM_CALL(
+            void(*)(BlockSource * self,const BlockPos *pos),
             MSSYM_B1QE17updateNeighborsAtB1AE11BlockSourceB2AAE17QEAAXAEBVBlockPosB3AAAA1Z,
-            trapdoor::BlockSource *source,
-            trapdoor::BlockPos * pos
-    ) {
-        auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
-        if (!modInstance->getSingFunction().preventNCUpdate)
-            original(source, pos);
-    }
-}
+            this, pos
+    );
+ */
+
+THook(
+    void,
+    MSSYM_B1QE17updateNeighborsAtB1AE11BlockSourceB2AAE17QEAAXAEBVBlockPosB3AAAA1Z,
+    trapdoor::BlockSource *source, trapdoor::BlockPos *pos) {
+    auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
+    if (!modInstance->getSingFunction().preventNCUpdate)
+        original(source, pos);
+}
+} // namespace mod