Remove nullable from RollingStock#train

railcraft-reborn · Sep 5, 2023 · d456d75 · d456d75
1 parent 29fdf68
commit d456d75
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/api/java/mods/railcraft/api/carts/RollingStock.java b/src/api/java/mods/railcraft/api/carts/RollingStock.java
@@ -10,7 +10,6 @@
 import java.util.stream.StreamSupport;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.mojang.authlib.GameProfile;
 import mods.railcraft.api.container.manipulator.ContainerManipulator;
 import mods.railcraft.api.container.manipulator.SlotAccessor;
@@ -238,12 +237,11 @@ default Stream<RollingStock> traverseTrainWithSelf(Side side) {
     return Stream.concat(Stream.of(this), this.traverseTrain(side));
   }
 
-  @Nullable
   Train train();
 
-  default boolean isSameTrainAs(@NotNull RollingStock minecart) {
-    Objects.requireNonNull(minecart, "minecart cannot be null.");
-    return this.train() == minecart.train();
+  default boolean isSameTrainAs(@NotNull RollingStock rollingStock) {
+    Objects.requireNonNull(rollingStock, "rollingStock cannot be null.");
+    return this.train() == rollingStock.train();
   }
 
   /**