Fix merge conflicts.

EternalCodeTeam · Jun 19, 2023 · 8e6f353 · 8e6f353
1 parent 7d060da
commit 8e6f353
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/command/argument/SpeedTypeArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/command/argument/SpeedTypeArgument.java
@@ -1,6 +1,6 @@
 package com.eternalcode.core.command.argument;
 
-import com.eternalcode.core.notification.Notification;
+import com.eternalcode.core.notice.Notice;
 import com.eternalcode.core.translation.Translation;
 import com.eternalcode.core.translation.TranslationManager;
 import com.eternalcode.core.feature.essentials.speed.SpeedType;
@@ -22,7 +22,7 @@ public SpeedTypeArgument(BukkitViewerProvider viewerProvider, TranslationManager
     }
 
     @Override
-    public Result<SpeedType, Notification> parse(LiteInvocation invocation, String argument, Translation translation) {
+    public Result<SpeedType, Notice> parse(LiteInvocation invocation, String argument, Translation translation) {
         return Option.supplyThrowing(IllegalArgumentException.class, () -> SpeedType.valueOf(argument.toUpperCase()))
                 .toResult(() -> translation.player().speedTypeNotCorrect());
     }

diff --git a/...alcore-core/src/main/java/com/eternalcode/core/feature/essentials/speed/SpeedCommand.java b/...alcore-core/src/main/java/com/eternalcode/core/feature/essentials/speed/SpeedCommand.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.command.argument.SpeedArgument;
-import com.eternalcode.core.notification.NoticeService;
+import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.argument.Arg;
 import dev.rollczi.litecommands.argument.By;