@@ -76,14 +76,12 @@ Hooks.once("init", () => {
76
76
registerSystemSettings ( ) ;
77
77
preloadHandlebarsTemplates ( ) ;
78
78
79
-
80
-
81
79
Handlebars . registerHelper ( "enrichHtmlHelper" , function ( rawText ) {
82
80
return TextEditor . enrichHTML ( rawText , { async : false } ) ;
83
81
} ) ;
84
82
85
- Handlebars . registerHelper ( 'ifIn' , function ( elem , list , options ) {
86
- if ( list && list . indexOf ( elem ) > - 1 ) {
83
+ Handlebars . registerHelper ( 'ifIn' , function ( elem , list , options ) {
84
+ if ( list && list . indexOf ( elem ) > - 1 ) {
87
85
return options . fn ( this ) ;
88
86
}
89
87
return options . inverse ( this ) ;
@@ -100,7 +98,7 @@ Hooks.once("init", () => {
100
98
} ) ;
101
99
102
100
Hooks . once ( "ready" , async function ( ) {
103
-
101
+
104
102
setupCards ( ) ;
105
103
conditions . onReady ( ) ;
106
104
Hooks . on ( "hotbarDrop" , ( bar , data , slot ) => createRollMacro ( data , slot ) ) ;
@@ -113,17 +111,16 @@ Hooks.on('canvasReady', () => {
113
111
canvas . hud . token = new VaesenTokenHUD ( ) ;
114
112
} ) ;
115
113
116
- Hooks . on ( "updateActor" , ( actor , changes , diff , userId ) => {
114
+ Hooks . on ( "updateActor" , ( actor , changes , diff , userId ) => {
117
115
// if we don't have an active scene, don't do anything
118
- if ( ! game . scenes . current ) return ;
116
+ if ( ! game . scenes . current || ! actor . isOwner || changes . name == undefined ) return ;
119
117
console . log ( "updateActor" , actor , changes , diff , userId ) ;
120
118
game . scenes . current . tokens . forEach ( x => {
121
119
if ( x . actorId !== actor . _id )
122
120
return ;
123
- if ( changes . name !== undefined ) {
124
- actor . update ( { "token.name" : actor . name } ) ;
125
- x . update ( { "name" : actor . name } ) ;
126
- }
121
+
122
+ actor . update ( { "token.name" : actor . name } ) ;
123
+ x . update ( { "name" : actor . name } ) ;
127
124
} ) ;
128
125
} ) ;
129
126
@@ -136,11 +133,11 @@ Hooks.on('dropActorSheetData', async (actor, sheet, data) => {
136
133
sheet . _dropHeadquarter ( headquarter ) ;
137
134
} ) ;
138
135
139
- Hooks . on ( "yze-combat.fast-action-button-clicked" , async function ( data ) {
136
+ Hooks . on ( "yze-combat.fast-action-button-clicked" , async function ( data ) {
140
137
await conditions . onActionCondition ( data ) ;
141
138
} ) ;
142
139
143
- Hooks . on ( "yze-combat.slow-action-button-clicked" , async function ( data ) {
140
+ Hooks . on ( "yze-combat.slow-action-button-clicked" , async function ( data ) {
144
141
await conditions . onActionCondition ( data ) ;
145
142
} ) ;
146
143
@@ -247,7 +244,7 @@ async function setupCards() {
247
244
const initiativeDeck = game . cards ?. get ( initiativeDeckId ) ;
248
245
//return early if both the deck and the ID exist in the world
249
246
if ( initiativeDeckId && initiativeDeck )
250
- return ;
247
+ return ;
251
248
ui . notifications . info ( 'UI.NoInitiativeDeckFound' , { localize : true } ) ;
252
249
const preset = CONFIG . Cards . presets . initiative ;
253
250
const data = await foundry . utils . fetchJsonWithTimeout ( preset . src ) ;
@@ -343,7 +340,7 @@ actor.sheet.rollWeapon("${data.itemId}");`;
343
340
flags : { "vaesen.skillRoll" : true }
344
341
} ) ;
345
342
}
346
-
343
+
347
344
game . user . assignHotbarMacro ( macro , slot ) ;
348
345
return false ;
349
346
}
0 commit comments