Skip to content

Commit 3c97e4d

Browse files
committed
refactor: clean bossbar related functions
1 parent 21b027d commit 3c97e4d

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/legacy/api/PlayerAPI.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,8 +2324,8 @@ Local<Value> PlayerClass::setBossBar(const Arguments& args) {
23242324
float value = (float)percent / 100;
23252325

23262326
// Remove BossBar firstly
2327-
BossEventPacket* removePkt =
2328-
static_cast<BossEventPacket*>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent).get());
2327+
auto removePkt =
2328+
static_pointer_cast<BossEventPacket>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent));
23292329
removePkt->mBossID = ActorUniqueID(uid);
23302330
removePkt->mEventType = BossEventUpdateType::Remove;
23312331
removePkt->sendTo(*player);
@@ -2356,9 +2356,9 @@ Local<Value> PlayerClass::setBossBar(const Arguments& args) {
23562356
bs.writeUnsignedVarInt(0, nullptr, nullptr);
23572357
auto addPkt = lse::api::NetworkPacket<MinecraftPacketIds::AddActor>(std::move(bs.mBuffer));
23582358

2359-
BossBarColor color = (BossBarColor)args[3].asNumber().toInt32();
2360-
BossEventPacket* pkt =
2361-
static_cast<BossEventPacket*>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent).get());
2359+
BossBarColor color = (BossBarColor)args[3].asNumber().toInt32();
2360+
auto pkt =
2361+
static_pointer_cast<BossEventPacket>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent));
23622362
pkt->mEventType = BossEventUpdateType::Add;
23632363
pkt->mBossID = ActorUniqueID(uid);
23642364
pkt->mName = args[1].asString().toString();
@@ -2384,8 +2384,7 @@ Local<Value> PlayerClass::setBossBar(const Arguments& args) {
23842384

23852385
BossBarColor color = BossBarColor::Red;
23862386
if (args.size() >= 3) color = (BossBarColor)args[2].asNumber().toInt32();
2387-
BossEventPacket* pkt =
2388-
static_cast<BossEventPacket*>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent).get());
2387+
auto pkt = static_pointer_cast<BossEventPacket>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent));
23892388
pkt->mEventType = BossEventUpdateType::Add;
23902389
pkt->mName = args[0].asString().toString();
23912390
pkt->mHealthPercent = value;
@@ -2402,8 +2401,8 @@ Local<Value> PlayerClass::removeBossBar(const Arguments& args) {
24022401
Player* player = get();
24032402
if (!player) return Local<Value>();
24042403

2405-
BossEventPacket* pkt =
2406-
static_cast<BossEventPacket*>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent).get());
2404+
auto pkt =
2405+
static_pointer_cast<BossEventPacket>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent));
24072406
pkt->mEventType = BossEventUpdateType::Remove;
24082407
pkt->mColor = BossBarColor::Red;
24092408
pkt->sendTo(*player);
@@ -2416,9 +2415,9 @@ Local<Value> PlayerClass::removeBossBar(const Arguments& args) {
24162415
try {
24172416
Player* player = get();
24182417
if (!player) return Local<Value>();
2419-
int64_t uid = args[0].asNumber().toInt64();
2420-
BossEventPacket* pkt =
2421-
static_cast<BossEventPacket*>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent).get());
2418+
int64_t uid = args[0].asNumber().toInt64();
2419+
auto pkt =
2420+
static_pointer_cast<BossEventPacket>(MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent));
24222421
pkt->mBossID = ActorUniqueID(uid);
24232422
pkt->mEventType = BossEventUpdateType::Remove;
24242423
pkt->sendTo(*player);

0 commit comments

Comments
 (0)