Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add forceEnjoy parameter to Pet.gainClosenessFullness to ignore existing fullness value

Browse Source
This commit is contained in:
Charlie Unfricht
2022-08-17 16:39:21 -04:00
parent 677a956b25
commit 3a16a724f5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/client/inventory/Pet.java
View File

@@ -185,11 +185,16 @@ public class Pet extends Item {
} }
public void gainClosenessFullness(Character owner, int incTameness, int incFullness, int type) { public void gainClosenessFullness(Character owner, int incTameness, int incFullness, int type) {
gainClosenessFullness(owner, incTameness, incFullness, type, false);
}
public void gainClosenessFullness(Character owner, int incTameness, int incFullness, int type, boolean forceEnjoy) {
byte slot = owner.getPetIndex(this); byte slot = owner.getPetIndex(this);
boolean enjoyed; boolean enjoyed;
//will NOT increase pet's closeness if tried to feed pet with 100% fullness //will NOT increase pet's closeness if tried to feed pet with 100% fullness
if (fullness < 100 || incFullness == 0) { //incFullness == 0: command given // unless forceEnjoy == true (cash shop)
if (fullness < 100 || incFullness == 0 || forceEnjoy) { //incFullness == 0: command given
int newFullness = fullness + incFullness; int newFullness = fullness + incFullness;
if (newFullness > 100) { if (newFullness > 100) {
newFullness = 100; newFullness = 100;