diff --git a/fabric/src/main/java/dev/architectury/hooks/level/entity/fabric/EntityHooksImpl.java b/fabric/src/main/java/dev/architectury/hooks/level/entity/fabric/EntityHooksImpl.java
index 69d2460d..3f3c719e 100644
--- a/fabric/src/main/java/dev/architectury/hooks/level/entity/fabric/EntityHooksImpl.java
+++ b/fabric/src/main/java/dev/architectury/hooks/level/entity/fabric/EntityHooksImpl.java
@@ -34,7 +34,7 @@ public class EntityHooksImpl {
     
     @Nullable
     public static Entity fromCollision(CollisionContext ctx) {
-        return ctx instanceof EntityCollisionContext ? ((EntityCollisionContext) ctx).getEntity().orElse(null) : null;
+        return ctx instanceof EntityCollisionContext ? ((EntityCollisionContext) ctx).getEntity() : null;
     }
     
     public static EntityInLevelCallback wrapEntityInLevelCallback(Entity entity, EntityInLevelCallback callback) {
diff --git a/gradle.properties b/gradle.properties
index 0fd1bbb9..dc8bf9c5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.daemon=false
 
 forgeEnabled=false
 
-minecraft_version=21w43a
-supported_version=21w43a
+minecraft_version=21w44a
+supported_version=21w44a
 crane_version=1.17.1+build.1
 
 cf_type=beta
@@ -15,7 +15,7 @@ base_version=3.0
 maven_group=dev.architectury
 
 fabric_loader_version=0.11.7
-fabric_api_version=0.41.2+1.18
+fabric_api_version=0.41.4+1.18
 mod_menu_version=3.0.0
 
 forge_version=37.0.69