Merge branch 'master' into feat/postgresql-database

# Conflicts:
#	config.yaml
#	src/main/java/config/ServerConfig.java

src/main/java/client/Character.java

@@ -59,6 +59,7 @@ import scripting.AbstractPlayerInteraction;
 import scripting.event.EventInstanceManager;
 import scripting.item.ItemScriptManager;
 import server.*;
+import server.ExpLogger.ExpLogRecord;
 import server.ItemInformationProvider.ScriptedItem;
 import server.events.Events;
 import server.events.RescueGaga;
@@ -151,6 +152,7 @@ public class Character extends AbstractCharacterObject {
     private final AtomicInteger gachaexp = new AtomicInteger();
     private final AtomicInteger meso = new AtomicInteger();
     private final AtomicInteger chair = new AtomicInteger(-1);
+    private long totalExpGained = 0;
     private int merchantmeso;
     private BuddyList buddylist;
     private EventInstanceManager eventInstance = null;
@@ -3094,6 +3096,7 @@ public class Character extends AbstractCharacterObject {
                 leftover = nextExp - Integer.MAX_VALUE;
             }
             updateSingleStat(Stat.EXP, exp.addAndGet((int) total));
+            totalExpGained += total;
             if (show) {
                 announceExpGain(gain, equip, party, inChat, white);
             }
@@ -3110,6 +3113,20 @@ public class Character extends AbstractCharacterObject {
                 gainExpInternal(leftover, equip, party, false, inChat, white);
             } else {
                 lastExpGainTime = System.currentTimeMillis();
+
+                if (YamlConfig.config.server.USE_EXP_GAIN_LOG) {
+                    ExpLogRecord expLogRecord = new ExpLogger.ExpLogRecord(
+                        getWorldServer().getExpRate(),
+                        expCoupon,
+                        totalExpGained,
+                        exp.get(),
+                        new Timestamp(lastExpGainTime),
+                        id
+                    );
+                    ExpLogger.putExpLogRecord(expLogRecord);
+                }
+
+                totalExpGained = 0;
             }
         }
     }

src/main/java/client/inventory/manipulator/KarmaManipulator.java

@@ -43,7 +43,7 @@ public class KarmaManipulator {
             flag ^= karmaFlag;
             flag |= ItemConstants.UNTRADEABLE;
 
-            item.setFlag((byte) flag);
+            item.setFlag(flag);
         }
     }
 
@@ -53,6 +53,6 @@ public class KarmaManipulator {
 
         flag |= karmaFlag;
         flag &= (0xFFFFFFFF ^ ItemConstants.UNTRADEABLE);
-        item.setFlag((byte) flag);
+        item.setFlag(flag);
     }
 }