Fix the merge

Cubed-Development · Jul 19, 2023 · dc7adf4 · dc7adf4
1 parent 31bd44c
commit dc7adf4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java
@@ -293,10 +293,8 @@ else if(model instanceof AcogReticle) {
         .withCompatibleAttachment(Attachments.Bipod, renderContext -> {
             PlayerWeaponInstance instance = renderContext.getWeaponInstance();
             if(instance != null) {
-                ItemAttachment<Weapon> activeAttachment = WeaponAttachmentAspect.getActiveAttachment(
-                        AttachmentCategory.GUARD, instance);
-                if(activeAttachment == Attachments.ACRPrecisionHandGuard 
-                		|| activeAttachment == Attachments.ACRPrecisionHandGuardTan) {
+                ItemAttachment<Weapon> activeAttachment = WeaponAttachmentAspect.getActiveAttachment(AttachmentCategory.GUARD, instance);
+                if(activeAttachment == Attachments.ACRPrecisionHandGuardTan) {
                 	GL11.glTranslatef(-0.2F, -0.35F, -5F);
     	            GL11.glScaled(1F, 1F, 1F);
                 } else {