Skip to content

Commit

Permalink
Formatting + remove artifacts
Browse files Browse the repository at this point in the history
Signed-off-by: GitHub <[email protected]>
  • Loading branch information
Kas-tle authored Sep 25, 2023
1 parent 0d8485f commit 2c52392
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 25 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,6 @@ jobs:
arguments: build
cache-read-only: ${{ github.ref_name != 'master' && github.ref_name != 'development' }}

- name: Archive artifacts (Floodgate Bungee)
uses: actions/upload-artifact@v2
if: success()
with:
name: Floodgate Bungee
path: bungee/build/libs/floodgate-bungee.jar

- name: Archive artifacts (Floodgate Spigot)
uses: actions/upload-artifact@v2
if: success()
with:
name: Floodgate Spigot
path: spigot/build/libs/floodgate-spigot.jar

- name: Archive artifacts (Floodgate Velocity)
uses: actions/upload-artifact@v2
if: success()
with:
name: Floodgate Velocity
path: velocity/build/libs/floodgate-velocity.jar

- name: Publish to Maven Repository
if: ${{ github.repository == 'GeyserMC/Floodgate' }}
uses: gradle/gradle-build-action@v2
Expand Down
11 changes: 7 additions & 4 deletions spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class ClassNames {

String nmsPackage = SPIGOT_MAPPING_PREFIX + '.';


// SpigotInjector
MINECRAFT_SERVER = getClassOrFallback(
"net.minecraft.server.MinecraftServer",
Expand Down Expand Up @@ -292,9 +292,12 @@ private static <T> T checkNotNull(@CheckForNull T toCheck, @CheckForNull String
}

// Ensure one of two is not null
private static <T> T checkNotNull(@CheckForNull T toCheck, @CheckForNull T toCheck2,
@CheckForNull String objectName,
@CheckForNull String objectName2) {
private static <T> T checkNotNull(
@CheckForNull T toCheck,
@CheckForNull T toCheck2,
@CheckForNull String objectName,
@CheckForNull String objectName2
) {
return Preconditions.checkNotNull(toCheck != null ? toCheck : toCheck2,
objectName2 + " cannot be null if " + objectName + " is null");
}
Expand Down

0 comments on commit 2c52392

Please sign in to comment.