Compare commits

..

5 Commits

Author SHA1 Message Date
Alexander Brandes
b0823306a9 Merge branch 'main' into chore/sqlite3.43-mitigate 2023-10-08 21:41:29 +02:00
Alexander Brandes
830503d2ab Merge branch 'main' into chore/sqlite3.43-mitigate 2023-10-07 20:14:30 +02:00
Pierre Maurice Schwang
ab246cd304 chore/feat: log driver version on error 2023-10-06 13:26:33 +02:00
Pierre Maurice Schwang
2ffec0a3a5 Merge branch 'main' into chore/sqlite3.43-mitigate 2023-10-06 12:58:21 +02:00
Pierre Maurice Schwang
c91983c3a8 chore: mitigate possible future sqlite driver problems 2023-10-06 12:55:00 +02:00
4 changed files with 12 additions and 12 deletions

View File

@@ -385,9 +385,9 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
/** /**
* @deprecated Use {@link #restoreBreedable(Breedable)} instead * @deprecated Use {@link #restoreBreedable(Breedable)} instead
* @since 7.1.0 * @since TODO
*/ */
@Deprecated(forRemoval = true, since = "7.1.0") @Deprecated(forRemoval = true, since = "TODO")
private void restoreAgeable(Ageable entity) { private void restoreAgeable(Ageable entity) {
if (!this.aged.adult) { if (!this.aged.adult) {
entity.setBaby(); entity.setBaby();
@@ -400,9 +400,9 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
/** /**
* @deprecated Use {@link #storeBreedable(Breedable)} instead * @deprecated Use {@link #storeBreedable(Breedable)} instead
* @since 7.1.0 * @since TODO
*/ */
@Deprecated(forRemoval = true, since = "7.1.0") @Deprecated(forRemoval = true, since = "TODO")
public void storeAgeable(Ageable aged) { public void storeAgeable(Ageable aged) {
this.aged = new AgeableStats(); this.aged = new AgeableStats();
this.aged.age = aged.getAge(); this.aged.age = aged.getAge();
@@ -411,7 +411,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
} }
/** /**
* @since 7.1.0 * @since TODO
*/ */
private void restoreBreedable(Breedable entity) { private void restoreBreedable(Breedable entity) {
if (!this.aged.adult) { if (!this.aged.adult) {
@@ -424,7 +424,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
} }
/** /**
* @since 7.1.0 * @since TODO
*/ */
private void storeBreedable(Breedable breedable) { private void storeBreedable(Breedable breedable) {
this.aged = new AgeableStats(); this.aged = new AgeableStats();

View File

@@ -960,7 +960,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
* @param caption Caption to send * @param caption Caption to send
* @param asyncReplacement Async variable replacement * @param asyncReplacement Async variable replacement
* @return A Future to be resolved, after the message was sent * @return A Future to be resolved, after the message was sent
* @since 7.1.0 * @since TODO
*/ */
public final CompletableFuture<Void> sendMessage( public final CompletableFuture<Void> sendMessage(
@NonNull Caption caption, @NonNull Caption caption,
@@ -976,7 +976,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
* @param asyncReplacements Async variable replacements * @param asyncReplacements Async variable replacements
* @param replacements Sync variable replacements * @param replacements Sync variable replacements
* @return A Future to be resolved, after the message was sent * @return A Future to be resolved, after the message was sent
* @since 7.1.0 * @since TODO
*/ */
public final CompletableFuture<Void> sendMessage( public final CompletableFuture<Void> sendMessage(
@NonNull Caption caption, @NonNull Caption caption,

View File

@@ -174,7 +174,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
* @since 6.4.0 * @since 6.4.0
* @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)} * @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
*/ */
@Deprecated(since = "7.1.0") @Deprecated(since = "TODO")
public static @NonNull Caption resolveName(final @Nullable UUID owner) { public static @NonNull Caption resolveName(final @Nullable UUID owner) {
return resolveName(owner, true); return resolveName(owner, true);
} }
@@ -188,7 +188,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
* @since 6.4.0 * @since 6.4.0
* @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)} * @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
*/ */
@Deprecated(since = "7.1.0") @Deprecated(since = "TODO")
public static @NonNull Caption resolveName(final @Nullable UUID owner, final boolean blocking) { public static @NonNull Caption resolveName(final @Nullable UUID owner, final boolean blocking) {
if (owner == null) { if (owner == null) {
return TranslatableCaption.of("info.none"); return TranslatableCaption.of("info.none");
@@ -237,7 +237,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
* *
* @param uuid The UUID of the player (for example provided by {@link Plot#getOwner()} * @param uuid The UUID of the player (for example provided by {@link Plot#getOwner()}
* @return A CompletableFuture resolving to a Caption representing the players name of the uuid * @return A CompletableFuture resolving to a Caption representing the players name of the uuid
* @since 7.1.0 * @since TODO
*/ */
@Contract("_->!null") @Contract("_->!null")
public @NonNull CompletableFuture<Caption> getUsernameCaption(@Nullable UUID uuid) { public @NonNull CompletableFuture<Caption> getUsernameCaption(@Nullable UUID uuid) {

View File

@@ -22,7 +22,7 @@ plugins {
} }
group = "com.intellectualsites.plotsquared" group = "com.intellectualsites.plotsquared"
version = "7.1.0" version = "7.0.1-SNAPSHOT"
if (!File("$rootDir/.git").exists()) { if (!File("$rootDir/.git").exists()) {
logger.lifecycle(""" logger.lifecycle("""