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

Maker & Storage fetch Wz + Buff system & PS / HM patch + Pet Evolution

Browse Source 
Storage now fetches transaction fees from the WZ.
Maker now pulls info about catalyzers from the WZ.
Fixed the enhanced buff system disappearing with some statsup when using multiple-statups items.
Fixed hired merchant now removing owner and visitors at expiration time.
Fixed some concurrent issues with player shops and hired merchants.
Fixed pet evolutions, now not only handing out not-expired pets but also refreshing the expire time as well.
Added item replace behaviour on the item expire system.
This commit is contained in:
ronancpl
2018-06-07 12:57:56 -03:00
parent ce74680953
commit cdac59326a
22 changed files with 486 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/scripting/AbstractPlayerInteraction.java
View File

@@ -372,7 +372,7 @@ public class AbstractPlayerInteraction {
MaplePet evolved = null;
MaplePet target;
long period = 90 * 24 * 60 * 60 * 1000; //refreshes expiration date: 90 days
long period = (long) 90 * 24 * 60 * 60 * 1000; //refreshes expiration date: 90 days
target = getPlayer().getPet(slot);
if(target == null) {
@@ -437,8 +437,8 @@ public class AbstractPlayerInteraction {
Item item = null;
MaplePet evolved;
int petId = -1;
if (quantity >= 0) {
if (quantity >= 0) {
if (ItemConstants.isPet(id)) {
petId = MaplePet.createPet(id);
@@ -456,6 +456,7 @@ public class AbstractPlayerInteraction {
evolved.setCloseness(from.getCloseness());
evolved.setFullness(from.getFullness());
evolved.setLevel(from.getLevel());
evolved.setExpiration(System.currentTimeMillis() + expires);
evolved.saveToDb();
}