qiuzhi/LiteLoaderBDS-1.16.40
1
0
Fork 0
mirror of https://github.com/quizhizhe/LiteLoaderBDS-1.16.40.git synced 2025-06-01 19:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix WitherBossDestroy Event

Browse Source
This commit is contained in:
Qiuzhizhe 2023-02-09 01:45:02 -08:00
parent 951c5e1f7d
commit bcd2a1f717
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
LiteLoader/Kernel/EventAPI.cpp
View File

@ -1355,7 +1355,7 @@ TClasslessInstanceHook(void, "?onRedstoneUpdate@ComparatorBlock@@UEBAXAEAVBlockS
// 没有这个符号
TClasslessInstanceHook(bool, "?_pullInItems@Hopper@@IEAA_NAEAVBlockSource@@AEAVContainer@@AEBVVec3@@@Z",
BlockSource* bs, void* container, Vec3* pos) {
bool isMinecart = dAccess<bool>(this, 5); // IDA Hopper::Hopper 未知正确
bool isMinecart = dAccess<bool>(this, 5); // IDA Hopper::Hopper 正确
IF_LISTENED(HopperSearchItemEvent) {
HopperSearchItemEvent ev{};
@ -1775,20 +1775,34 @@ TClasslessInstanceHook(void, "?explode@Explosion@@QEAAXXZ") {
////////////// WitherBossDestroy //////////////
// 没有这个符号
THook(void, "?destroyBlocks@@YAXAEAVLevel@@AEBVAABB@@AEAVBlockSource@@H@Z",
Level* level, AABB* aabb, BlockSource* bs, int range) {
IF_LISTENED(WitherBossDestroyEvent) {
WitherBossDestroyEvent ev{};
ev.mWitherBoss = dAccess<WitherBoss*>(level,-102); // WitherBoss::newServerAiStep Line515
ev.mDestroyRange = *aabb;
if (!ev.call())
return;
// 在1.16.40里destroyBlocks不是WitherBoss类的成员
// 只能从调用destroyBlocks的WitherBoss::newServerAiStep获取实体指针
namespace{
WitherBoss* mWitherBoss;
}
TClasslessInstanceHook(void,"?newServerAiStep@WitherBoss@@UEAAXXZ"){
IF_LISTENED(WitherBossDestroyEvent) {
mWitherBoss = (WitherBoss*)this;
}
IF_LISTENED_END(WitherBossDestroyEvent)
return original(this);
}
*aabb = ev.mDestroyRange;
}
IF_LISTENED_END(WitherBossDestroyEvent)
original(level, aabb, bs, range);
}
THook(void, "?destroyBlocks@@YAXAEAVLevel@@AEBVAABB@@AEAVBlockSource@@H@Z",
Level* level, AABB* aabb, BlockSource* bs, int range) {
IF_LISTENED(WitherBossDestroyEvent) {
WitherBossDestroyEvent ev{};
// ev.mWitherBoss = dAccess<WitherBoss*>(level,-816); // WitherBoss::newServerAiStep Line515
ev.mWitherBoss = mWitherBoss;
ev.mDestroyRange = *aabb;
if (!ev.call())
return;
*aabb = ev.mDestroyRange;
}
IF_LISTENED_END(WitherBossDestroyEvent)
original(level, aabb, bs, range);
}
////////////// EntityRide //////////////