Skip to content

Impl. Changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
R00tB33rMan wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Impl. Changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28aa800
Fix /b ch SubElements for Avatar (#1384)
ArifKalender Apr 26, 2025
4bb35a5
Update to Java 21 and Minecraft 1.20 (#1383)
JustAHuman-xD Apr 26, 2025
1268062
Fix Ice damage not being applied during slow cooldown (#1385)
OO0oo0oOOooo Apr 26, 2025
07688d6
Upstream
R00tB33rMan May 13, 2025
e329373
Explicit try/catch for Temorsense on shutdown (you'd have to experime…
R00tB33rMan May 13, 2025
1ccfff4
Upstream
R00tB33rMan Jun 3, 2025
f4770c7
Push additional implementations
R00tB33rMan Jun 19, 2025
9885497
Additional subset for experimental resolves
R00tB33rMan Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,18 @@
<artifactId>luminol</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Folia API -->
<!-- Paper API -->
<dependency>
<groupId>dev.folia</groupId>
<artifactId>folia-api</artifactId>
<version>1.20.1-R0.1-SNAPSHOT</version>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Spigot API -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version>
<version>1.20.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -263,10 +263,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -296,7 +296,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -309,7 +309,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -322,7 +322,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
<version>3.4.2</version>
<configuration>
<finalName>ProjectKorra-${project.version}</finalName>
<outputDirectory>../target/</outputDirectory>
Expand All @@ -331,7 +331,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.6.0</version>
<configuration>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<filters>
Expand Down Expand Up @@ -363,4 +363,4 @@
<dir>${project.build.directory}</dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
</project>
4 changes: 2 additions & 2 deletions core/src/com/projectkorra/projectkorra/GeneralMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ public static String getLastUsedAbility(final Player player, final boolean check
if (ComboManager.checkForValidCombo(player) != null && checkCombos) {
return ComboManager.checkForValidCombo(player).getName();
} else {
return lastUsedAbility.get(0).getAbilityName();
return lastUsedAbility.getFirst().getAbilityName();
}
}
return null;
Expand Down Expand Up @@ -1083,7 +1083,7 @@ public static Block getBottomBlock(final Location loc, final int positiveY, fina
}

public static ArrayList<Element> getElementsWithNoWeaponBending() {
final ArrayList<Element> elements = new ArrayList<Element>();
final ArrayList<Element> elements = new ArrayList<>();

if (!plugin.getConfig().getBoolean("Properties.Air.CanBendWithWeapons")) {
elements.add(Element.AIR);
Expand Down
Loading