Merge branch 'hotfix/2.39.2' into main

Author: Lakeyzer

package-lock.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.39.1",
+	"version": "2.39.2",
 	"name": "shieldmaiden",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Shieldmaiden",

package.json

@@ -196,7 +196,7 @@ export default {
 		...mapActions(["setManual", "setMultipliers"]),
 		...mapActions("tutorial", ["completeStep"]),
 		focus() {
-			this.$refs.input.focus();
+			this.$refs.input?.focus();
 		},
 		typeLabel(type) {
 			type = type.split("_");
@@ -248,7 +248,7 @@ export default {
 
 				//Reset values
 				this.knob_value = 0;
-				this.$refs.input.blur();
+				this.$refs.input?.blur();
 				this.setManual({ key: "clear" });
 				this.setMultipliers({ type: "clear" });
 			}
@@ -271,9 +271,10 @@ export default {
 		},
 	},
 	mounted() {
-		EventBus.$on("applyManualValue", (type) => {
-			this.applyManual(type);
-		});
+		EventBus.$on("applyManualValue", this.applyManual);
+	},
+	beforeDestroy() {
+		EventBus.$off("applyManualValue", this.applyManual);
 	},
 	directives: {
 		scrollWheel: {

src/components/combat/actions/Manual.vue

@@ -254,7 +254,7 @@ export default {
 			return index + 1 < length ? "+" : "";
 		},
 		startRoll(e, projectiles, option, action_index, action, category) {
-			if (this.targeted && this.targeted.length) {
+			if (this.targeted?.length) {
 				this.rollObject = {
 					e,
 					projectiles,
@@ -327,4 +327,4 @@ export default {
 .roll-wrapper {
 	border-radius: 999px;
 }
-</style>
+</style>

src/components/combat/actions/RollActions.vue

@@ -219,7 +219,7 @@ export default {
 	},
 	methods: {
 		startRoll(e, projectiles, option, action_index, action, category) {
-			if (this.targeted && this.targeted.length) {
+			if (this.targeted?.length) {
 				this.rollObject = {
 					e,
 					projectiles,
@@ -248,7 +248,7 @@ export default {
 				action_index: this.rollObject.action_index,
 				action: this.rollObject.action,
 				category: this.rollObject.category,
-				entity: this.current_actor,
+				entity: this.entity,
 				targets: assigned_projectiles || this.targeted,
 				option: this.rollObject.option,
 			});

src/components/combat/entities/Card/CardActions.vue

@@ -320,16 +320,16 @@ export const setHP = {
 			}
 		},
 		addLog(type, crit, target, current, amount, over, config) {
-			var d = new Date();
-			var time = d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds();
+			const d = new Date();
+			const time = d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds();
 
 			if (localStorage.getItem(this.encounterId)) {
 				this.log = JSON.parse(localStorage.getItem(this.encounterId));
 			} else {
 				this.log = [];
 			}
 
-			var newLog = {
+			const newLog = {
 				round: this.encounter.round,
 				turn: this.encounter.turn + 1,
 				by: current.key,