flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

minor changes

This commit is contained in:
Daniel O'Brien 2013-11-14 07:02:53 +11:00
parent c17f77cf2a
commit 8c6bdca425
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Entities/Player.cpp
View File

@ -267,7 +267,7 @@ int cPlayer::CalcLevelFromXp(int a_XpTotal)
//level 0 to 15
if(a_XpTotal <= XP_TO_LEVEL15)
{
return (int) a_XpTotal / XP_PER_LEVEL_TO15;
return a_XpTotal / XP_PER_LEVEL_TO15;
}
//level 30+
@ -345,11 +345,11 @@ bool cPlayer::SetExperience(int a_XpTotal)
int cPlayer::AddExperience(int a_Xp_delta)
{
if(a_Xp_delta > MAX_EXPERIENCE_ORB_SIZE || a_Xp_delta < 0)
if(a_Xp_delta < 0)
{
//value was too large or negative, abort and report
LOGWARNING("Attempt was made to increment Xp by %d, max is %d and must be positive",
a_Xp_delta, MAX_EXPERIENCE_ORB_SIZE);
//value was negative, abort and report
LOGWARNING("Attempt was made to increment Xp by %d, must be positive",
a_Xp_delta);
return -1; //should we instead just return the current Xp?
}

2
source/Entities/Player.h
View File

@ -70,7 +70,7 @@ public:
*/
bool SetExperience(int a_XpTotal);
/* Adds Xp, will not inc more than MAX_EXPERIENCE_ORB_SIZE!
/* Adds Xp, "should" not inc more than MAX_EXPERIENCE_ORB_SIZE unless you're a plugin being funny, *cough* cheating
Returns the new total experience, -1 on error
*/
int AddExperience(int a_Xp_delta);