Merge conteneur + fix hotbar

module/rdd-hotbar-drop.js

@@ -2,6 +2,20 @@ import { Misc } from "./misc.js";
 
 export class RdDHotbar {
 
+  static async addToHotbar(item, slot) {
+    let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`;
+    let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command));
+    if (!macro) {
+      macro = await Macro.create({
+        name: item.name,
+        type: "script",
+        img: item.img,
+        command: command
+      }, { displaySheet: false })
+    }
+    await game.user.assignHotbarMacro(macro, slot);
+  }
+
   /**
    * Create a macro when dropping an entity on the hotbar
    * Item      - open roll dialog for item
@@ -10,7 +24,7 @@ export class RdDHotbar {
    */
   static initDropbar() {
 
-    Hooks.on("hotbarDrop", async (bar, documentData, slot) => {
+    Hooks.on("hotbarDrop", (bar, documentData, slot) => {
 
       // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
       if (documentData.type == "Item") {
@@ -22,22 +36,12 @@ export class RdDHotbar {
         if (!item || (item.type != "arme" && item.type != "competence")) {
           return true
         }
-        let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`;
+        this.addToHotbar(item, slot)
-        let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command));
-        if (!macro) {
-          macro =  await Macro.create({
-            name: item.name,
-            type: "script",
-            img: item.img,
-            command: command
-          }, { displaySheet: false })
-        }
-        game.user.assignHotbarMacro(macro, slot);
         return false
       }
 
       return true
-  });
+    })
   }
 
   /** Roll macro */