Fix: Fix the issue with IFeature vtable and the issue with StackResul…

…tStorageFeature::tryUnwrap.
LiteLDev · Jan 18, 2024 · 3175162 · 3175162
1 parent 85f5f2a
commit 3175162
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/mc/world/level/levelgen/feature/IFeature.h b/src/mc/world/level/levelgen/feature/IFeature.h
@@ -11,18 +11,21 @@ class IFeature {
 
 public:
     // NOLINTBEGIN
+    // vIndex: 0
+    virtual ~IFeature() = default;
+
     // vIndex: 1
-    // virtual std::optional<class BlockPos>
-    // place(class IBlockWorldGenAPI&, class BlockPos const&, class Random&, class RenderParams&) const = 0;
+    virtual std::optional<class BlockPos>
+    place(class IBlockWorldGenAPI&, class BlockPos const&, class Random&, class RenderParams&) const = 0;
 
     // vIndex: 2, symbol:
     // ?isValidPlacement@IFeature@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
-    // virtual bool isValidPlacement(std::string const&);
+    virtual bool isValidPlacement(std::string const&);
 
     // symbol: ?setBlockSafe@IFeature@@QEBA_NAEAVIBlockWorldGenAPI@@AEBVBlockPos@@AEBVBlock@@H@Z
     MCAPI bool
     setBlockSafe(class IBlockWorldGenAPI& target, class BlockPos const& pos, class Block const& block, int updateFlags)
         const;
 
     // NOLINTEND
-};
+};
diff --git a/src/mc/world/level/levelgen/feature/gamerefs_feature/StackResultStorageFeature.h b/src/mc/world/level/levelgen/feature/gamerefs_feature/StackResultStorageFeature.h
@@ -12,7 +12,7 @@ class StackResultStorageFeature {
     template <class T = IFeature>
     [[nodiscard]] optional_ref<T> tryUnwrap() const {
         if (_hasValue()) {
-            return *(T*)(&_getStackRef());
+            return reinterpret_cast<T*>(&_getStackRef());
         }
         return nullptr;
     }