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

Commit to "tameness" name over "closeness" for pets, fix scripts

Browse Source
This commit is contained in:
P0nk
2022-09-15 17:12:21 +02:00
parent 125d0aa03d
commit 1a28fc98ac
11 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ public final class PetCommandHandler extends AbstractPacketHandler {
}
if (Randomizer.nextInt(100) < petCommand.getProbability()) {
pet.gainClosenessFullness(chr, petCommand.getIncrease(), 0, command);
pet.gainTamenessFullness(chr, petCommand.getIncrease(), 0, command);
chr.getMap().broadcastMessage(PacketCreator.commandResponse(chr.getId(), petIndex, false, command, false));
} else {
chr.getMap().broadcastMessage(PacketCreator.commandResponse(chr.getId(), petIndex, true, command, false));

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

@@ -81,7 +81,7 @@ public final class PetFoodHandler extends AbstractPacketHandler {
return;
}
pet.gainClosenessFullness(chr, (pet.getFullness() <= 75) ? 1 : 0, 30, 1); // 25+ "emptyness" to get +1 closeness
pet.gainTamenessFullness(chr, (pet.getFullness() <= 75) ? 1 : 0, 30, 1); // 25+ "emptyness" to get +1 tameness
InventoryManipulator.removeFromSlot(c, InventoryType.USE, pos, (short) 1, false);
} finally {
useInv.unlockInventory();

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);
if (pair.getRight()) {
pet.gainClosenessFullness(player, pair.getLeft(), 100, 1, true);
pet.gainTamenessFullness(player, pair.getLeft(), 100, 1, true);
remove(c, position, itemId);
break;
}