Skip to content

Commit

Permalink
🔀 Merge pull request #319 from SkytAsul/develop
Browse files Browse the repository at this point in the history
release/1.0.3
  • Loading branch information
SkytAsul authored May 25, 2024
2 parents 611b234 + 6542dfc commit 50d7f64
Show file tree
Hide file tree
Showing 98 changed files with 4,218 additions and 3,452 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
target/
.settings/
/integrations/jars/
.flattened-pom.xml
239 changes: 0 additions & 239 deletions api/dependency-reduced-pom.xml

This file was deleted.

13 changes: 9 additions & 4 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>fr.skytasul</groupId>
<artifactId>beautyquests-parent</artifactId>
<version>1.0.2</version>
<version>${revision}</version>
</parent>

<properties>
Expand All @@ -22,6 +22,7 @@
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>revxrsal.commands</pattern>
Expand All @@ -39,7 +40,7 @@
<includes>
<include>com/cryptomorin/xseries/XMaterial*</include>
<include>com/cryptomorin/xseries/XBlock*</include>
<include>com/cryptomorin/xseries/XPotion*</include>
<include>com/cryptomorin/xseries/XEnchantment*</include>
</includes>
</filter>
</filters>
Expand Down Expand Up @@ -115,6 +116,10 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository> <!-- For Adventure snapshots, in paper 1.20.6 -->
<id>sonatype-oss-snapshots1</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>

<dependencies>
Expand All @@ -134,7 +139,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.20.1-R0.1-SNAPSHOT</version>
<version>${minecraft.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -151,7 +156,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>9.8.0</version>
<version>9.10.0</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
package fr.skytasul.quests.api.events.accounts;

import fr.skytasul.quests.api.players.PlayerAccount;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import fr.skytasul.quests.api.players.PlayerAccount;

public abstract class PlayerAccountEvent extends Event {

protected final @NotNull PlayerAccount account;

protected PlayerAccountEvent(@NotNull PlayerAccount account) {
this.account = account;
}

public boolean isAccountCurrent() {
return account.isCurrent();
}

public @Nullable Player getPlayer() {
if (!account.isCurrent())
throw new IllegalStateException("Account is not currently used");
throw new IllegalStateException("Account " + account.debugName() + " is not currently used");

return account.getPlayer();
}

public @NotNull PlayerAccount getPlayerAccount() {
return account;
}

}
Loading

0 comments on commit 50d7f64

Please sign in to comment.