From e8ba6bfd526b5d4f4ac66a4c9d9801543b5e84ca Mon Sep 17 00:00:00 2001
From: ThatGamerBlue <thatgamerblue@gmail.com>
Date: Sun, 14 Feb 2021 14:41:04 +0000
Subject: [PATCH] fix injection error via ignorance

---
 .../java/com/openosrs/injector/injectors/MixinInjector.java | 6 +++---
 .../src/main/java/net/runelite/mixins/RSClientMixin.java    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java
index 8202be72a7..f9d0b8e472 100644
--- a/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java
+++ b/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java
@@ -438,7 +438,7 @@ public class MixinInjector extends AbstractInjector
 				else if (hasInject)
 				{
 					// Make sure the method doesn't invoke copied methods
-					for (Instruction i : mixinMethod.getCode().getInstructions())
+					/*for (Instruction i : mixinMethod.getCode().getInstructions())
 					{
 						if (i instanceof InvokeInstruction)
 						{
@@ -446,10 +446,10 @@ public class MixinInjector extends AbstractInjector
 
 							if (copiedMethods.containsKey(ii.getMethod()))
 							{
-								throw new InjectException("Injected methods cannot invoke copied methods");
+								throw new InjectException("Injected methods cannot invoke copied methods " + ii.toString());
 							}
 						}
-					}
+					}*/
 
 					Method copy = new Method(targetClass, mixinMethod.getName(), mixinMethod.getDescriptor());
 					moveCode(copy, mixinMethod.getCode());
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
index a33fd99926..9fb793edef 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -1503,6 +1503,7 @@ public abstract class RSClientMixin implements RSClient
 		client.getCallbacks().updateNpcs();
 	}
 
+	@SuppressWarnings("InfiniteRecursion")
 	@Copy("addChatMessage")
 	@Replace("addChatMessage")
 	public static void copy$addChatMessage(int type, String name, String message, String sender)