File tree Expand file tree Collapse file tree 2 files changed +16
-0
lines changed
src/main/java/studio/magemonkey/divinity Expand file tree Collapse file tree 2 files changed +16
-0
lines changed Original file line number Diff line number Diff line change 11package studio .magemonkey .divinity .hooks .external ;
22
3+ import org .bukkit .Bukkit ;
34import org .bukkit .Material ;
45import org .bukkit .entity .LivingEntity ;
56import org .bukkit .entity .Player ;
@@ -163,6 +164,14 @@ public boolean ignoreDivinity(LivingEntity player) {
163164 return divinityIgnored .contains (player .getUniqueId ());
164165 }
165166
167+ public boolean isSkillDamage () {
168+ if (!Bukkit .getPluginManager ().isPluginEnabled ("Fabled" )) {
169+ return false ;
170+ }
171+
172+ return Skill .isSkillDamage ();
173+ }
174+
166175 public void addSkill (Player player , String skillId , int level ) {
167176 PlayerData playerData = Fabled .getData (player );
168177 Skill skill = Fabled .getSkill (skillId );
Original file line number Diff line number Diff line change 3333import studio .magemonkey .divinity .api .PartyAPI ;
3434import studio .magemonkey .divinity .api .event .DivinityDamageEvent ;
3535import studio .magemonkey .divinity .config .EngineCfg ;
36+ import studio .magemonkey .divinity .hooks .EHook ;
37+ import studio .magemonkey .divinity .hooks .external .FabledHook ;
3638import studio .magemonkey .divinity .hooks .external .mythicmobs .AbstractMythicMobsHK ;
3739import studio .magemonkey .divinity .manager .effects .main .AdjustStatEffect ;
3840import studio .magemonkey .divinity .manager .effects .main .DisarmEffect ;
@@ -217,6 +219,11 @@ public void onDamageRPGStart(@NotNull DivinityDamageEvent.Start e) {
217219 double powerMod = metadata == null || metadata .isEmpty ()
218220 ? (statsDamager != null ? statsDamager .getAttackPowerModifier () : 1D )
219221 : metadata .get (0 ).asInt ();
222+ FabledHook skillApi = (FabledHook ) Divinity .getInstance ().getHook (EHook .SKILL_API );
223+ if (skillApi != null && skillApi .isSkillDamage () && damager != null && !skillApi .ignoreDivinity (damager )) {
224+ powerMod = 1 ;
225+ }
226+
220227 double directMod = meta .getDirectModifier ();
221228 double critMod = meta .getCriticalModifier ();
222229 double blockMod = meta .getBlockModifier ();
You can’t perform that action at this time.
0 commit comments