Merge pull request #214 from leevccc/master #patch

fix: item lock cant extend lock time
fix: seal lock cant extend lock time
2024-02-04 14:22:00 +01:00 · 2024-01-14 22:13:16 +08:00 · 2024-01-14 18:15:48 +08:00
1 changed files with 4 additions and 3 deletions
--- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java
+++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java
@@ -228,10 +228,10 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
                    return;
                }
                short flag = eq.getFlag();
-                flag |= ItemConstants.LOCK;
-                if (eq.getExpiration() > -1) {
+                if (eq.getExpiration() > -1 && (eq.getFlag() & ItemConstants.LOCK) != ItemConstants.LOCK) {
                    return; //No perma items pls
                }
+                flag |= ItemConstants.LOCK;
                eq.setFlag(flag);

                long period = 0;
@@ -246,7 +246,8 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
                }

                if (period > 0) {
-                    eq.setExpiration(currentServerTime() + DAYS.toMillis(period));
+                    long expiration = eq.getExpiration() > -1 ? eq.getExpiration() : currentServerTime();
+                    eq.setExpiration(expiration + DAYS.toMillis(period));
                }

                // double-remove found thanks to BHB
Author	SHA1	Message	Date
Ponk	ceb2866aa1	Merge pull request #214 from leevccc/master #patch fix: item lock cant extend lock time	2024-02-04 14:22:00 +01:00
leevccc	08b089d9be	fix: seal lock cant extend lock time	2024-01-14 22:13:16 +08:00
leevccc	8b254a294e	fix: item lock cant extend lock time	2024-01-14 18:15:48 +08:00