lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvements for previous commit.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-08-24 12:20:26 +00:00
parent 5413c9f399
commit e9c019ac84
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -34,6 +34,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
@@ -10375,37 +10376,27 @@ public class PlayerInstance extends Playable
slot--; slot--;
if (_henna[slot] == null) final HennaInstance henna = _henna[slot];
if (henna == null)
{ {
return false; return false;
} }
HennaInstance henna = _henna[slot]; _henna[slot] = null;
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(DELETE_CHAR_HENNA))
{ {
PreparedStatement statement = con.prepareStatement(DELETE_CHAR_HENNA); ps.setInt(1, getObjectId());
statement.setInt(1, getObjectId()); ps.setInt(2, slot + 1);
statement.setInt(2, slot + 1); ps.setInt(3, _classIndex);
statement.setInt(3, getClassIndex()); ps.execute();
statement.execute();
statement.close();
} }
catch (Exception e) catch (Exception e)
{ {
LOGGER.warning("could not remove char henna: " + e); LOGGER.log(Level.SEVERE, "Failed removing character henna.", e);
} }
// Add the recovered dyes to the player's inventory and notify them.
getInventory().addItem("Henna", henna.getItemIdDye(), henna.getAmountDyeRequire() / 2, this, null);
SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S);
sm.addItemName(henna.getItemIdDye());
sm.addNumber(henna.getAmountDyeRequire() / 2);
sendPacket(sm);
_henna[slot] = null;
// Calculate Henna modifiers of this PlayerInstance // Calculate Henna modifiers of this PlayerInstance
recalcHennaStats(); recalcHennaStats();
@@ -10415,6 +10406,14 @@ public class PlayerInstance extends Playable
// Send Server->Client UserInfo packet to this PlayerInstance // Send Server->Client UserInfo packet to this PlayerInstance
sendPacket(new UserInfo(this)); sendPacket(new UserInfo(this));
// Add the recovered dyes to the player's inventory and notify them.
_inventory.addItem("Henna", henna.getItemIdDye(), henna.getAmountDyeRequire() / 2, this, null);
SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S);
sm.addItemName(henna.getItemIdDye());
sm.addNumber(henna.getAmountDyeRequire() / 2);
sendPacket(sm);
return true; return true;
} }