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

Merge pull request #104 from cpurules/bugfix/pet-cash-food

Browse Source 
Allow pet cash food to increase closeness even when pet fullness is maxed
This commit is contained in:
Ponk
2022-08-19 07:09:58 +02:00
committed by GitHub
parent 677a956b25 8d4842d2ea
commit 6d969106c0
2 changed files with 7 additions and 2 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;

2
src/main/java/net/server/channel/handlers/UseCashItemHandler.java
View File

@@ -419,7 +419,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
Pair<Integer, Boolean> pair = pet.canConsume(itemId); Pair<Integer, Boolean> pair = pet.canConsume(itemId);
if (pair.getRight()) { if (pair.getRight()) {
pet.gainClosenessFullness(player, pair.getLeft(), 100, 1); pet.gainClosenessFullness(player, pair.getLeft(), 100, 1, true);
remove(c, position, itemId); remove(c, position, itemId);
break; break;
} }