Skip to content

Commit 47bb404

Browse files
committed
fix: fix mc.getEntities #310
1 parent 0eb50ef commit 47bb404

File tree

3 files changed

+27
-30
lines changed

3 files changed

+27
-30
lines changed

docs/apis/GameAPI/Entity.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ This function returns an array of entity objects, each of which corresponds to a
2121

2222
### Get entities in a specified area
2323

24-
`mc.getEntities(startPos[,endPos],range)`
24+
`mc.getEntities(startPos[,range])`
25+
`mc.getEntities(startPos,endPos[,range])`
2526

2627
- Parameters:
2728
- startPos : `IntPos` / `FloatPos`

docs/apis/GameAPI/Entity.zh.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
### 获取在特定范围内的实体
2222

23-
`mc.getEntities(startPos[,endPos],range)`
23+
`mc.getEntities(startPos[,range])`
24+
`mc.getEntities(startPos,endPos[,range])`
2425

2526
- 参数:
2627
- startPos : `IntPos` / `FloatPos`

src/legacy/api/EntityAPI.cpp

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,7 @@ Local<Value> EntityClass::isMoving() {
356356
Actor* entity = get();
357357
if (!entity) return Local<Value>();
358358

359-
return Boolean::newBoolean(
360-
SynchedActorDataAccess::getActorFlag(entity->getEntityContext(), ActorFlags::Moving)
359+
return Boolean::newBoolean(SynchedActorDataAccess::getActorFlag(entity->getEntityContext(), ActorFlags::Moving)
361360
);
362361
}
363362
CATCH("Fail in isMoving!")
@@ -1559,7 +1558,7 @@ Local<Value> McClass::getEntities(const Arguments& args) {
15591558
}
15601559
if (args.size() > 2) {
15611560
if (args[2].getKind() == ValueKind::kNumber) {
1562-
dis = args[1].asNumber().toFloat();
1561+
dis = args[2].asNumber().toFloat();
15631562
} else {
15641563
LOG_WRONG_ARG_TYPE(__FUNCTION__);
15651564
return Local<Value>();
@@ -1588,7 +1587,7 @@ Local<Value> McClass::getEntities(const Arguments& args) {
15881587
}
15891588
return arr;
15901589
}
1591-
CATCH("Fail in GetAllEntities");
1590+
CATCH("Fail in getEntities");
15921591
}
15931592

15941593
Local<Value> McClass::getEntity(const Arguments& args) {
@@ -1794,18 +1793,16 @@ Local<Value> McClass::explode(const Arguments& args) {
17941793
bool isDestroy = args[beginIndex + 2].asBoolean().value();
17951794
bool isFire = args[beginIndex + 3].asBoolean().value();
17961795

1797-
return Boolean::newBoolean(
1798-
ll::service::getLevel()->explode(
1799-
ll::service::getLevel()->getDimension(pos.dim).lock()->getBlockSourceFromMainChunkSource(),
1800-
source.value_or(nullptr),
1801-
pos.getVec3(),
1802-
radius,
1803-
isFire,
1804-
isDestroy,
1805-
FLT_MAX,
1806-
false
1807-
)
1808-
);
1796+
return Boolean::newBoolean(ll::service::getLevel()->explode(
1797+
ll::service::getLevel()->getDimension(pos.dim).lock()->getBlockSourceFromMainChunkSource(),
1798+
source.value_or(nullptr),
1799+
pos.getVec3(),
1800+
radius,
1801+
isFire,
1802+
isDestroy,
1803+
FLT_MAX,
1804+
false
1805+
));
18091806
} else {
18101807
CHECK_ARG_TYPE(args[beginIndex + 1], ValueKind::kNumber);
18111808
CHECK_ARG_TYPE(args[beginIndex + 2], ValueKind::kNumber);
@@ -1817,18 +1814,16 @@ Local<Value> McClass::explode(const Arguments& args) {
18171814
bool isDestroy = args[beginIndex + 3].asBoolean().value();
18181815
bool isFire = args[beginIndex + 4].asBoolean().value();
18191816

1820-
return Boolean::newBoolean(
1821-
ll::service::getLevel()->explode(
1822-
ll::service::getLevel()->getDimension(pos.dim).lock()->getBlockSourceFromMainChunkSource(),
1823-
source.value_or(nullptr),
1824-
pos.getVec3(),
1825-
radius,
1826-
isFire,
1827-
isDestroy,
1828-
maxResistance,
1829-
false
1830-
)
1831-
);
1817+
return Boolean::newBoolean(ll::service::getLevel()->explode(
1818+
ll::service::getLevel()->getDimension(pos.dim).lock()->getBlockSourceFromMainChunkSource(),
1819+
source.value_or(nullptr),
1820+
pos.getVec3(),
1821+
radius,
1822+
isFire,
1823+
isDestroy,
1824+
maxResistance,
1825+
false
1826+
));
18321827
}
18331828
}
18341829
CATCH("Fail in Explode!");

0 commit comments

Comments
 (0)