Revert "Allowing injecting in constructor's (FabricMC#30 FabricMC#40)"

This reverts commit 536170a.
LlamaLad7 · May 19, 2024 · 9cf325d · 9cf325d
1 parent 3a090bd
commit 9cf325d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java
@@ -351,19 +351,6 @@ public boolean checkPriority(int targetPriority, int mixinPriority) {
      * @return restriction level
      */
     public RestrictTargetLevel getTargetRestriction(IInjectionPointContext context) {
-        return RestrictTargetLevel.CONSTRUCTORS_AFTER_DELEGATE; // Fabric change: allow inject in constructors
-    }
-
-    /**
-     * Returns the target restriction level for this injection point's cancellation for
-     * {@literal @Inject} annotations. This level defines whether an injection point
-     * can declare {@code cancellable = true}.
-     *
-     * @param context injection-specific context
-     * @return restriction level
-     */
-    // Fabric addition: prevent cancellation of inject in constructors
-    public RestrictTargetLevel getCancellationRestriction(IInjectionPointContext context) {
         return RestrictTargetLevel.METHODS_ONLY;
     }
 

diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
@@ -439,16 +439,6 @@ protected void addTargetNode(Target target, List<InjectionNode> myNodes, Abstrac
                 throw new InvalidInjectionException(this.info, String.format("%s selector %s", ip, ex.getMessage()));
             }
 
-            // Fabric start: prevent cancellation in constructor injections
-            if (this.cancellable) {
-                try {
-                    this.checkTargetForNode(target, injectionNode, ip.getCancellationRestriction(this.info));
-                } catch (InvalidInjectionException ex) {
-                    throw new InvalidInjectionException(this.info, String.format("%s selector (cancellable = true) %s", ip, ex.getMessage()));
-                }
-            }
-            // Fabric end
-
             String id = ip.getId();
             if (Strings.isNullOrEmpty(id)) {
                 continue;