fix only one effect triggering

GodHybrid · Aug 23, 2020 · 49bfcd3 · 49bfcd3
1 parent 40c3615
commit 49bfcd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Core/ROREffects/Common/StickyBombEffect.cs b/Core/ROREffects/Common/StickyBombEffect.cs
@@ -29,12 +29,12 @@ public override string UIInfo()
 
 		public override float Chance => 0.08f;
 
-		void IOnHit.OnHitNPC(Player player, Item item, NPC target, int damage, float knockback, bool crit)
+		public void OnHitNPC(Player player, Item item, NPC target, int damage, float knockback, bool crit)
 		{
 			SpawnProjectile(player, target);
 		}
 
-		void IOnHit.OnHitNPCWithProj(Player player, Projectile proj, NPC target, int damage, float knockback, bool crit)
+		public void OnHitNPCWithProj(Player player, Projectile proj, NPC target, int damage, float knockback, bool crit)
 		{
 			SpawnProjectile(player, target);
 		}

diff --git a/Core/ROREffects/ROREffectManager.cs b/Core/ROREffects/ROREffectManager.cs
@@ -359,8 +359,14 @@ public static bool CanDoEffect<T>(ROREffect effect) where T : IROREffectInterfac
 				RORPlayer mPlayer = effect.Player.GetRORPlayer();
 				if (mPlayer.CanProc())
 				{
-					mPlayer.SetProcTimer();
-					return effect.Proc();
+					//If ProcTimer is 0
+					bool result = effect.Proc();
+					if (result)
+					{
+						//If proced, set timer
+						mPlayer.SetProcTimer();
+					}
+					return result;
 				}
 				return false;
 			}