From becac84e6e86bea718035cb5d24b60ac098945d6 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Wed, 18 Sep 2019 02:06:28 +0200 Subject: [PATCH 01/22] Setup Actions test --- .github/workflows/gradle.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 000000000..22c3d6c65 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,24 @@ +name: Java CI + +on: + push: + branches: + - breaking + - master + pull_request: + branches: + - breaking + - master + +jobs: + test: + runs-on: ubuntu-18.04 + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Test with Gradle + run: ./gradlew clean build From 267bebd0e8e9c4e9508510ebdcbf7a6d43db1af7 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 1 Oct 2019 12:12:42 +0200 Subject: [PATCH 02/22] Improve world generator diagnosis --- .../plotsquared/plot/commands/DebugPaste.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java index e9471e6e7..c3858265f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java @@ -115,6 +115,15 @@ import java.util.stream.Collectors; "&cSkipping PlotSquared.use_THIS.yml because it's empty"); } + try { + final File MultiverseWorlds = + new File(PlotSquared.get().IMP.getDirectory(), "../../plugins/Multiverse-Core/worlds.yml"); + incendoPaster + .addFile(new IncendoPaster.PasteFile("MultiverseCore/worlds.yml", readFile(MultiverseWorlds))); + } catch (final IOException ignored) { + MainUtil.sendMessage(player, "&cSkipping Multiverse worlds.yml because the plugin is not in use"); + } + try { final String rawResponse = incendoPaster.upload(); final JsonObject jsonObject = From b074e6e198b53676b457997ccde94ac2fe4663a2 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 1 Oct 2019 12:54:20 +0200 Subject: [PATCH 03/22] Update auto-comment.yml I created templates and setup Actions to ensure functionality. --- .github/auto-comment.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml index f7584d42e..38721ffb9 100644 --- a/.github/auto-comment.yml +++ b/.github/auto-comment.yml @@ -6,10 +6,3 @@ issueOpened: > Failure to do so will prevent us from resolving the issue in a timely manner. Please note that suggestions are now to be submitted to https://git.io/fN5B4 rather than this issue tracker! - -pullRequestOpened: > - Thank your for raising your pull request. - - Please make sure you have followed our contributing guidelines and to take an extra look at the code to make sure that it is functional! - - We will review it as soon as possible! From ca25b7b3c80d4e00c7626ba06f967bddd3b4cae1 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 1 Oct 2019 13:02:32 +0200 Subject: [PATCH 04/22] Fix odd space --- .../github/intellectualsites/plotsquared/bukkit/BukkitMain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java index 9596a25e9..272d09056 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java @@ -702,7 +702,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain + " is using Offline Mode UUIDs either because of user preference, or because you are using an old version of " + "Bukkit"); } else { - PlotSquared.log(Captions.PREFIX + " " + getPluginName() + " is using online UUIDs"); + PlotSquared.log(Captions.PREFIX + "" + getPluginName() + " is using online UUIDs"); } if (Settings.UUID.USE_SQLUUIDHANDLER) { return new SQLUUIDHandler(wrapper); From 59bc6f19e5a5a8ddeb422ef653075c32082512ee Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 1 Oct 2019 14:01:50 +0200 Subject: [PATCH 05/22] General clarification of the config Certain values were rather vague and caused some confusion in the past, hopefully things are more clear now. --- .../plotsquared/plot/config/Settings.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java index c03a0b82c..6cb5eb287 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java @@ -256,10 +256,10 @@ public class Settings extends Config { public static final class Done { - @Comment("Require a done plot to download") public static boolean REQUIRED_FOR_DOWNLOAD = + @Comment("Require a plot marked as done to download") public static boolean REQUIRED_FOR_DOWNLOAD = false; - @Comment("Only done plots can be rated") public static boolean REQUIRED_FOR_RATINGS = false; - @Comment("Restrict building when a plot is done") public static boolean RESTRICT_BUILDING = + @Comment("Only plots marked as done can be rated") public static boolean REQUIRED_FOR_RATINGS = false; + @Comment("Restrict building when a plot is marked as done") public static boolean RESTRICT_BUILDING = false; @Comment("The limit being how many plots a player can claim") public static boolean COUNTS_TOWARDS_LIMIT = true; @@ -269,14 +269,15 @@ public class Settings extends Config { public static final class Chat { @Comment("Sometimes console color doesn't work, you can disable it here") public static boolean CONSOLE_COLOR = true; - @Comment("Should chat be interactive") public static boolean INTERACTIVE = true; + @Comment("Should the chat be interactive?") public static boolean INTERACTIVE = true; } @Comment("Relating to how many plots someone can claim ") public static final class Limit { @Comment("Should the limit be global (over multiple worlds)") public static boolean GLOBAL = false; - @Comment("The range of permissions to check e.g. plots.plot.127") public static int + @Comment({"The max. range of permissions to check e.g. plots.plot.127", "The value covers the range to check only, you need to assign the permission to players/groups still", + "Modifying the value does NOT change the amount of plots players can claim"}) public static int MAX_PLOTS = 127; } @@ -291,7 +292,7 @@ public class Settings extends Config { @Comment("Teleport to your plot on death") public static boolean ON_DEATH = false; @Comment("Teleport to your plot on login") public static boolean ON_LOGIN = false; @Comment("Teleport to your plot on claim") public static boolean ON_CLAIM = true; - @Comment("Add a teleportation delay to all commands") public static int DELAY = 0; + @Comment("Add a delay to all teleport commands") public static int DELAY = 0; @Comment("The visit command is ordered by world instead of globally") public static boolean PER_WORLD_VISIT = false; } @@ -322,7 +323,7 @@ public class Settings extends Config { @Comment( - {"Enable or disable part of the plugin", "Note: A cache will use some memory if enabled"}) + {"Enable or disable parts of the plugin", "Note: A cache will use some memory if enabled"}) public static final class Enabled_Components { // Group the following values into a new config section @Comment("The database stores all the plots") public static boolean DATABASE = true; @Comment("Events are needed to track a lot of things") public static boolean EVENTS = true; @@ -339,7 +340,7 @@ public class Settings extends Config { @Comment("Allow WorldEdit to be restricted to plots") public static boolean WORLDEDIT_RESTRICTIONS = true; @Comment("Allow economy to be used") public static boolean ECONOMY = true; - @Comment("Send anonymous usage statistics. Bukkit only setting.") public static boolean + @Comment("Send anonymous usage statistics to bStats. Bukkit only setting.") public static boolean METRICS = true; @Comment("Expiry will clear old or simplistic plots") public static boolean PLOT_EXPIRY = false; @@ -355,7 +356,7 @@ public class Settings extends Config { @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER = false; @Comment("Delete plots when a player is banned") public static boolean BAN_DELETER = false; - @Comment("Prevent possibly unsafe blocks from being used in plot components") + @Comment({"Prevent possibly unsafe blocks from being used in plot components", "Can be bypassed with `/plot debugallowunsafe`"}) public static boolean PREVENT_UNSAFE = true; } } From b92d42e7cc2a55194cae691fbf0a3aaf24223487 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 1 Oct 2019 14:46:19 +0200 Subject: [PATCH 06/22] Add clarification to what files are pasted --- .../intellectualsites/plotsquared/plot/commands/DebugPaste.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java index c3858265f..e57ecf211 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.stream.Collectors; @CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste", - description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your latest.log to https://athion.net/ISPaster/paste", + description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml your latest.log and Multiverse's worlds.yml (if being used) to https://athion.net/ISPaster/paste", permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste extends SubCommand { From c8c5d777a1aeff01ca8bd20ad3635fab0d3147ff Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 3 Oct 2019 00:40:41 +0200 Subject: [PATCH 07/22] Make paths... idk what to say here --- .../intellectualsites/plotsquared/plot/commands/DebugPaste.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java index e57ecf211..747d17161 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java @@ -117,7 +117,7 @@ import java.util.stream.Collectors; try { final File MultiverseWorlds = - new File(PlotSquared.get().IMP.getDirectory(), "../../plugins/Multiverse-Core/worlds.yml"); + new File(PlotSquared.get().IMP.getDirectory(), "../Multiverse-Core/worlds.yml"); incendoPaster .addFile(new IncendoPaster.PasteFile("MultiverseCore/worlds.yml", readFile(MultiverseWorlds))); } catch (final IOException ignored) { From 120d36e41381e4bb17eeb03eb1bab166e3abedf6 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 3 Oct 2019 01:12:08 +0200 Subject: [PATCH 08/22] Add a confirmation to the debugpaste That should prevent people from accidentally pressing buttons (whyever you would do that) --- .../plotsquared/plot/commands/DebugPaste.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java index 747d17161..9ea6d7bdd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java @@ -25,8 +25,8 @@ import java.util.stream.Collectors; @CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste", description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml your latest.log and Multiverse's worlds.yml (if being used) to https://athion.net/ISPaster/paste", - permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste - extends SubCommand { + permission = "plots.debugpaste", category = CommandCategory.DEBUG, confirmation = true, requiredType = RequiredType.NONE) +public class DebugPaste extends SubCommand { private static String readFile(@NonNull final File file) throws IOException { final List lines; From ae0f1d2a15b30d951fcf6b2ea176407b95c3cc06 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 3 Oct 2019 01:26:31 +0200 Subject: [PATCH 09/22] Adding "website" to plugin.yml --- Bukkit/src/main/resources/plugin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml index 0dbd861e0..c2e1350e4 100644 --- a/Bukkit/src/main/resources/plugin.yml +++ b/Bukkit/src/main/resources/plugin.yml @@ -6,6 +6,7 @@ load: STARTUP description: > Easy, yet powerful Plot World generation and management. authors: [Citymonstret, Empire92, MattBDev, dordsor21] +website: https://github.com/IntellectualSites/ softdepend: [BarAPI, CameraAPI, Vault] loadbefore: [MultiWorld, Multiverse-Core] depend: [WorldEdit] From b806a306391159a8120157104c77805f2658a95e Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 3 Oct 2019 01:32:19 +0200 Subject: [PATCH 10/22] Setting debug value default to false If the user is interested in the information or needs it for debugging, they can enable them, but we don't need to spam them unnecessarily with stats about his plot worlds on each startup, /plot reload, etc. The same information can be obtained from a debugpaste as well, so it's not a loss of information to offer assistance. --- .../intellectualsites/plotsquared/plot/config/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java index 6cb5eb287..b1e239c78 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java @@ -26,7 +26,7 @@ public class Settings extends Config { @Final public static String COMMIT; // These values are set from P2 before loading @Final public static String PLATFORM; // These values are set from P2 before loading - @Comment("Show additional information in console") public static boolean DEBUG = true; + @Comment("Show additional information in console") public static boolean DEBUG = false; @Comment({"The big annoying text that appears when you enter a plot", "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"}) public static boolean TITLES = true; From 8927f50cc6666035b869bea5db5ee712ed90a048 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:16:31 +0000 Subject: [PATCH 11/22] Bump snakeyaml from 1.23 to 1.25 Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.23 to 1.25. - [Commits](https://bitbucket.org/asomov/snakeyaml/commits) Signed-off-by: dependabot-preview[bot] --- Core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/build.gradle b/Core/build.gradle index 90a33b8d2..6c7a93f31 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -4,7 +4,7 @@ repositories { def textVersion = "3.0.2" dependencies { - implementation("org.yaml:snakeyaml:1.23") + implementation("org.yaml:snakeyaml:1.25") implementation("com.google.code.gson:gson:2.8.0") { because("Minecraft uses GSON 2.8.0") force = true From 806867120071e2bdcd2436ba49a7360259f33c23 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:16:54 +0000 Subject: [PATCH 12/22] Bump kotlin-stdlib from 1.3.30 to 1.3.50 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.30 to 1.3.50. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.50/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.30...v1.3.50) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index de4ca4e9b..94241b507 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -51,7 +51,7 @@ shadowJar { include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) include(dependency("com.squareup.okio:okio:2.2.2")) - include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.30")) + include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) } diff --git a/Core/build.gradle b/Core/build.gradle index 90a33b8d2..2a6a0b7cf 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") implementation("com.squareup.okhttp3:okhttp:3.14.0") implementation("com.squareup.okio:okio:2.2.2") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.30") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") } sourceCompatibility = 1.8 From ec6c9dac49d04753e27a09257cf20e136ca967d2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:16:57 +0000 Subject: [PATCH 13/22] Bump lombok from 1.18.8 to 1.18.10 Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.8 to 1.18.10. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10) Signed-off-by: dependabot-preview[bot] --- Core/build.gradle | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/build.gradle b/Core/build.gradle index 90a33b8d2..bc7b72708 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -9,7 +9,7 @@ dependencies { because("Minecraft uses GSON 2.8.0") force = true } - implementation("org.projectlombok:lombok:1.18.8") + implementation("org.projectlombok:lombok:1.18.10") compileOnly("org.projectlombok:lombok:1.18.8") testCompileOnly("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8") diff --git a/build.gradle b/build.gradle index 3d83a509b..54dd1bd80 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ subprojects { because("Minecraft uses Guava 21 as of 1.13") } compileOnly("org.jetbrains:annotations:17.0.0") - compileClasspath("org.projectlombok:lombok:1.18.8") + compileClasspath("org.projectlombok:lombok:1.18.10") testCompileOnly("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") From 3d1cd4605306a10ae6fed9122b6b66dab74e98b7 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Mon, 7 Oct 2019 19:09:41 +0200 Subject: [PATCH 14/22] Update Sponsors --- README.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 09c241a1b..00fe1784e 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,17 @@ Suggestions are welcome! We have a separate issue tracker for suggestions, that * [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/) # Sponsors -

-

-

-

+


+IntelliJ IDEA is a Java integrated development environment (IDE) for developing computer software. It is developed by JetBrains and our top used development tool. Every aspect of IntelliJ IDEA is specifically designed to maximize developer productivity. +Together, the powerful static code analysis and ergonomic design make development not only productive but also an enjoyable experience.

+


+YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET applications. +YourKit is the creator of YourKit Java Profiler, YourKit .NET Profiler, and YourKit YouMonitor. We are using it to profile the performance of our plugins.

+


+Athion is the result of the merging of two of the oldest creative servers around in the community – Mithrintia and Pwego-Insomnia – fusing together to perfect a creative experience like no other to develop and harness your skills.

+


+Welcome to the Builders's Refuge. The refuge is a passion project we started to accommodate professional Minecraft builders who are looking for a personal or commercial space to build and create art. We offer premium services at no charge along with a network of other builders and resources to help you become successful. +

+


+The AJGaming Network is a modded and vanilla network. Either delve into magic on our magic servers, fight your enemies on our hardcore PvP modpacks or have a good time on our vanilla servers. The mods for our modpacks are handpicked by suggestions from our community making sure we can crate packs you love to play. +

From a3905c68cf15ce571b4a564cbfc5521553a24cf6 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Mon, 7 Oct 2019 19:20:48 +0200 Subject: [PATCH 15/22] Fix links --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00fe1784e..5a23753a2 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ IntelliJ IDEA is a Java integrated development environment (IDE) for developing Together, the powerful static code analysis and ergonomic design make development not only productive but also an enjoyable experience.


YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET applications. -YourKit is the creator of YourKit Java Profiler, YourKit .NET Profiler, and YourKit YouMonitor. We are using it to profile the performance of our plugins.

+YourKit is the creator of YourKit Java Profiler, YourKit .NET Profiler, and YourKit YouMonitor. We are using YourKit to profile the performance of our plugins.


Athion is the result of the merging of two of the oldest creative servers around in the community – Mithrintia and Pwego-Insomnia – fusing together to perfect a creative experience like no other to develop and harness your skills.


From 599ef8aa44615f427e031b50968b894fa4ca2a1d Mon Sep 17 00:00:00 2001 From: mindw0rm Date: Thu, 10 Oct 2019 01:33:37 +0200 Subject: [PATCH 16/22] Bugfix for #2524 (place flag) --- .../plotsquared/bukkit/listeners/PlayerEvents.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java index f2e8f363a..f5856ed4d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java @@ -2046,6 +2046,7 @@ import java.util.regex.Pattern; location = BukkitUtil .getLocation(block.getRelative(event.getBlockFace()).getLocation()); eventType = PlayerBlockEventType.PLACE_BLOCK; + lb = new BukkitLazyBlock(new StringPlotBlock(type.toString())); break; } lb = new BukkitLazyBlock(PlotBlock.get(type.toString())); From 1f4f78a1793b3ee8a4ecc0b6e281af55b91c8c31 Mon Sep 17 00:00:00 2001 From: mindw0rm Date: Thu, 10 Oct 2019 01:53:27 +0200 Subject: [PATCH 17/22] this can be done more elegantly --- .../plotsquared/bukkit/listeners/PlayerEvents.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java index f5856ed4d..d02159dd9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java @@ -2042,14 +2042,14 @@ import java.util.regex.Pattern; if (type == Material.AIR) { type = offType; } + // in the following, lb needs to have the material of the item in hand i.e. type + lb = new BukkitLazyBlock(PlotBlock.get(type.toString())); if (type.isBlock()) { location = BukkitUtil .getLocation(block.getRelative(event.getBlockFace()).getLocation()); eventType = PlayerBlockEventType.PLACE_BLOCK; - lb = new BukkitLazyBlock(new StringPlotBlock(type.toString())); break; } - lb = new BukkitLazyBlock(PlotBlock.get(type.toString())); if (type.toString().toLowerCase().endsWith("egg")) { eventType = PlayerBlockEventType.SPAWN_MOB; } else { From 53e94cc0018837715cc0d62a9563a95ea41458a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 15:17:37 +0000 Subject: [PATCH 18/22] Bump gson from 2.8.0 to 2.8.6 Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.6. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6) Signed-off-by: dependabot-preview[bot] --- Core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/build.gradle b/Core/build.gradle index 2b0f40e2d..c1db0bf22 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -5,7 +5,7 @@ def textVersion = "3.0.2" dependencies { implementation("org.yaml:snakeyaml:1.25") - implementation("com.google.code.gson:gson:2.8.0") { + implementation("com.google.code.gson:gson:2.8.6") { because("Minecraft uses GSON 2.8.0") force = true } From 4a3c0155244031ca365f21d7f26c1604528d98a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 15:17:55 +0000 Subject: [PATCH 19/22] Bump asm from 7.1 to 7.2 Bumps asm from 7.1 to 7.2. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 54dd1bd80..667ba16f8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } configurations.all { resolutionStrategy { - force("org.ow2.asm:asm:7.1") + force("org.ow2.asm:asm:7.2") force("org.jetbrains:annotations:17.0.0") } } From 427cf081e3cfc3e5c3a42a69b0ff90711fae2182 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 21:37:55 +0000 Subject: [PATCH 20/22] Bump okio from 2.2.2 to 2.4.1 Bumps [okio](https://github.com/square/okio) from 2.2.2 to 2.4.1. - [Release notes](https://github.com/square/okio/releases) - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 94241b507..d30483859 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -50,7 +50,7 @@ shadowJar { include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) - include(dependency("com.squareup.okio:okio:2.2.2")) + include(dependency("com.squareup.okio:okio:2.4.1")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) diff --git a/Core/build.gradle b/Core/build.gradle index 8f84c938e..c460b60df 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -16,7 +16,7 @@ dependencies { testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") implementation("com.squareup.okhttp3:okhttp:3.14.0") - implementation("com.squareup.okio:okio:2.2.2") + implementation("com.squareup.okio:okio:2.4.1") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") } From e029cc3fa10d8ba2ddc6b55506d00be279a5a05a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 21:40:43 +0000 Subject: [PATCH 21/22] Bump retrofit from 2.4.0 to 2.6.2 Bumps [retrofit](https://github.com/square/retrofit) from 2.4.0 to 2.6.2. - [Release notes](https://github.com/square/retrofit/releases) - [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/retrofit/commits) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index d30483859..d8e52d3be 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -48,7 +48,7 @@ shadowJar { include(dependency(":Core")) // update notification stuff include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) - include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) + include(dependency("com.squareup.retrofit2:retrofit:2.6.2")) include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) include(dependency("com.squareup.okio:okio:2.4.1")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) From d7d9b1793f63bd96f731f301b5b376fa945a278b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 21:40:45 +0000 Subject: [PATCH 22/22] Bump okhttp from 3.14.0 to 4.2.2 Bumps [okhttp](https://github.com/square/okhttp) from 3.14.0 to 4.2.2. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-3.14.0...parent-4.2.2) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index d30483859..8faad8e43 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -49,7 +49,7 @@ shadowJar { // update notification stuff include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) - include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) + include(dependency("com.squareup.okhttp3:okhttp:4.2.2")) include(dependency("com.squareup.okio:okio:2.4.1")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) include(dependency("io.papermc:paperlib:1.0.2")) diff --git a/Core/build.gradle b/Core/build.gradle index c460b60df..1ba0b5505 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -15,7 +15,7 @@ dependencies { annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") - implementation("com.squareup.okhttp3:okhttp:3.14.0") + implementation("com.squareup.okhttp3:okhttp:4.2.2") implementation("com.squareup.okio:okio:2.4.1") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") }