Skip to content

Commit 10aca08

Browse files
ShrBoxShrBox
committed
fix: fix ScoreboardAPI
1 parent 47c1b30 commit 10aca08

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

‎src/legacy/api/ScoreboardAPI.cpp‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Local<Object> ObjectiveClass::newObjective(Objective* obj) {
3838

3939
void ObjectiveClass::set(Objective* obj) {
4040
if (obj) {
41-
objname = obj->getName();
41+
objname = obj->mName;
4242
isValid = true;
4343
}
4444
}
@@ -59,7 +59,7 @@ Local<Value> ObjectiveClass::getDisplayName() {
5959
try {
6060
Objective* obj = get();
6161
if (!obj) return Local<Value>();
62-
return String::newString(obj->getDisplayName());
62+
return String::newString(obj->mDisplayName);
6363
}
6464
CATCH("Fail in getDisplayName!")
6565
}
@@ -100,13 +100,12 @@ Local<Value> ObjectiveClass::setScore(const Arguments& args) {
100100
return Boolean::newBoolean(false);
101101
}
102102
const ScoreboardId& id = scoreboard.getScoreboardId(name);
103-
if (!id.isValid()) {
103+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
104104
scoreboard.createScoreboardId(name);
105105
}
106106
bool isSuccess = false;
107107
scoreboard.modifyPlayerScore(isSuccess, id, *obj, score, PlayerScoreSetFunction::Set);
108108
if (isSuccess) return Number::newNumber(score);
109-
return Local<Value>();
110109
} else if (IsInstanceOf<PlayerClass>(args[0])) {
111110
Player* player = PlayerClass::extract(args[0]);
112111
Scoreboard& scoreboard = ll::service::getLevel()->getScoreboard();
@@ -115,17 +114,15 @@ Local<Value> ObjectiveClass::setScore(const Arguments& args) {
115114
return Boolean::newBoolean(false);
116115
}
117116
const ScoreboardId& id = scoreboard.getScoreboardId(*player);
118-
if (!id.isValid()) {
117+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
119118
scoreboard.createScoreboardId(*player);
120119
}
121120
bool isSuccess = false;
122121
scoreboard
123122
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Set);
124123
if (isSuccess) return Number::newNumber(score);
125-
return Local<Value>();
126124
} else {
127125
LOG_WRONG_ARG_TYPE(__FUNCTION__);
128-
return Local<Value>();
129126
}
130127
return Local<Value>();
131128
}
@@ -147,14 +144,13 @@ Local<Value> ObjectiveClass::addScore(const Arguments& args) {
147144
return Boolean::newBoolean(false);
148145
}
149146
const ScoreboardId& id = scoreboard.getScoreboardId(name);
150-
if (!id.isValid()) {
147+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
151148
scoreboard.createScoreboardId(name);
152149
}
153150
bool isSuccess = false;
154151
scoreboard
155152
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Add);
156153
if (isSuccess) return Number::newNumber(score);
157-
return Local<Value>();
158154
} else if (IsInstanceOf<PlayerClass>(args[0])) {
159155
Player* player = PlayerClass::extract(args[0]);
160156
Scoreboard& scoreboard = ll::service::getLevel()->getScoreboard();
@@ -163,17 +159,15 @@ Local<Value> ObjectiveClass::addScore(const Arguments& args) {
163159
return Boolean::newBoolean(false);
164160
}
165161
const ScoreboardId& id = scoreboard.getScoreboardId(*player);
166-
if (!id.isValid()) {
162+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
167163
scoreboard.createScoreboardId(*player);
168164
}
169165
bool isSuccess = false;
170166
scoreboard
171167
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Add);
172168
if (isSuccess) return Number::newNumber(score);
173-
return Local<Value>();
174169
} else {
175170
LOG_WRONG_ARG_TYPE(__FUNCTION__);
176-
return Local<Value>();
177171
}
178172
return Local<Value>();
179173
}
@@ -195,14 +189,13 @@ Local<Value> ObjectiveClass::reduceScore(const Arguments& args) {
195189
return Boolean::newBoolean(false);
196190
}
197191
const ScoreboardId& id = scoreboard.getScoreboardId(name);
198-
if (!id.isValid()) {
192+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
199193
scoreboard.createScoreboardId(name);
200194
}
201195
bool isSuccess = false;
202196
scoreboard
203197
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Subtract);
204198
if (isSuccess) return Number::newNumber(score);
205-
return Local<Value>();
206199
} else if (IsInstanceOf<PlayerClass>(args[0])) {
207200
Player* player = PlayerClass::extract(args[0]);
208201
Scoreboard& scoreboard = ll::service::getLevel()->getScoreboard();
@@ -211,17 +204,15 @@ Local<Value> ObjectiveClass::reduceScore(const Arguments& args) {
211204
return Boolean::newBoolean(false);
212205
}
213206
const ScoreboardId& id = scoreboard.getScoreboardId(*player);
214-
if (!id.isValid()) {
207+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
215208
scoreboard.createScoreboardId(*player);
216209
}
217210
bool isSuccess = false;
218211
scoreboard
219212
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Subtract);
220213
if (isSuccess) return Number::newNumber(score);
221-
return Local<Value>();
222214
} else {
223215
LOG_WRONG_ARG_TYPE(__FUNCTION__);
224-
return Local<Value>();
225216
}
226217
return Local<Value>();
227218
}
@@ -239,7 +230,7 @@ Local<Value> ObjectiveClass::deleteScore(const Arguments& args) {
239230
return Boolean::newBoolean(false);
240231
}
241232
const ScoreboardId& id = scoreboard.getScoreboardId(args[0].asString().toString());
242-
if (!id.isValid()) {
233+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
243234
return Boolean::newBoolean(true);
244235
}
245236
// obj->_resetPlayer(id);
@@ -253,7 +244,7 @@ Local<Value> ObjectiveClass::deleteScore(const Arguments& args) {
253244
return Boolean::newBoolean(false);
254245
}
255246
const ScoreboardId& id = scoreboard.getScoreboardId(*player);
256-
if (!id.isValid()) {
247+
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
257248
return Boolean::newBoolean(true);
258249
}
259250
// obj->_resetPlayer(id);
@@ -275,15 +266,15 @@ Local<Value> ObjectiveClass::getScore(const Arguments& args) {
275266
Scoreboard& board = ll::service::getLevel()->getScoreboard();
276267
Objective* objective = board.getObjective(objname);
277268
ScoreboardId sid = board.getScoreboardId(args[0].asString().toString());
278-
if (!objective || !sid.isValid() || !objective->hasScore(sid)) {
269+
if (!objective || sid.mRawID == ScoreboardId::INVALID().mRawID || !objective->hasScore(sid)) {
279270
return {};
280271
}
281272
return Number::newNumber(objective->getPlayerScore(sid).mValue);
282273
} else if (IsInstanceOf<PlayerClass>(args[0])) {
283274
Scoreboard& board = ll::service::getLevel()->getScoreboard();
284275
Objective* objective = board.getObjective(objname);
285276
ScoreboardId sid = board.getScoreboardId(*PlayerClass::extract(args[0]));
286-
if (!objective || !sid.isValid() || !objective->hasScore(sid)) {
277+
if (!objective || sid.mRawID == ScoreboardId::INVALID().mRawID || !objective->hasScore(sid)) {
287278
return {};
288279
}
289280
return Number::newNumber(objective->getPlayerScore(sid).mValue);

0 commit comments

Comments
 (0)