Merge remote-tracking branch 'origin/v5' into features/v5/single-area

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: https://www.paypal.me/AlexanderBrandes # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE.md

@@ -28,6 +28,7 @@ assignees: ''
 <!--- Issue /plot debugpaste in game or in your console and copy the supplied URL here -->
 <!--- If you cannot perform the above, we require logs/latest.log; settings.yml; worlds.yml and possibly PlotSquared.use_THIS.yml -->
 <!--- If you are unwilling to supply the information we need, we reserve the right to not assist you. Redact IP addresses if you need to. -->
+**/plot debugpaste:** 
 
 ### Server type:
 **Select one**

.github/ISSUE_TEMPLATE/bug-issue-report-for-plotsquared.md

@@ -1,101 +0,0 @@
----
-name: Bug/Issue report for PlotSquared
-about: Bug / Issue report about this plugin
-title: ''
-labels: "[?] Testing Required"
-assignees: ''
-
----
-
-<!--- READ THIS BEFORE SUBMITTING AN ISSUE REPORT!!! -->
-
-<!--- ##### DO NOT REMOVE THIS TEMPLATE!  YOUR ISSUE *WILL* FIT IN IT! ##### -->
-
-<!--- # NOTICE: 
-
-**Feature requests & Suggestions are to be submitted at the [PlotSquared Suggestions tracker](https://github.com/IntellectualSites/PlotSquaredSuggestions)**
-
-**Code contributions are to be done through [PRs](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request), tagging the specific issue ticket(s) if applicable.**
-
-**[DISCORD INVITE LINK](https://discord.gg/KxkjDVg)**
--->
-
-# Bug Report Template:
-<!--- Incomplete reports will most likely be marked as invalid, and closed, with few exceptions.-->
-## Required Information section:
-> ALL FIELDS  IN THIS SECTION ARE REQUIRED, and must contain appropriate information
-### Server config info (/plot debugpaste / file paste links):
-<!--- Issue /plot debugpaste in game or in your console and copy the supplied URL here -->
-<!--- If you cannot perform the above, we require logs/latest.log; settings.yml; worlds.yml and possibly PlotSquared.use_THIS.yml -->
-<!--- If you are unwilling to supply the information we need, we reserve the right to not assist you. Redact IP addresses if you need to. -->
-**/plot debugpaste:** 
-
-### Server type:
-**Select one**
-<!-- Select the type you are reporting the issue for (put an "X" between of brackets): -->
-- [] Spigot / Paper *(CraftBukkit should not be used, re-test with Spigot first!)*
-- [] Sponge
-- [] NukkitX
-
-### PlotSquared version:
-<!-- Run /plot plugin in-game or in console & paste the full output here: -->
-```
-Paste the output here, between the tick marks, replacing this text
-```
-
-### Minecraft Version:
-**Select one**
-<!-- Select the type you are reporting the issue for (put an "X" between of brackets) -->
-- [] Minecraft 1.15.2
-- [] Minecraft 1.14.4
-- [] Minecraft 1.13.2
-- [] Minecraft 1.12.2
-- [] Minecraft 1.11.2
-- [] Minecraft 1.10.2
-- [] Minecraft 1.9.4
-- [] Minecraft 1.8.8
-- [] Minecraft Java Edition *other versions, please specify*:
-- [] Minecraft Bedrock Edition *specify version*:
-- [] Minecraft Sponge *specify version*:
-
-### Server build info: 
-<!--- Run /version in-game or in console & paste the full output here: -->
-```
-Paste the output here, between the tick marks, replacing this text
-```
-
-### WorldEdit/FAWE versions:
-<!--- Specify which plugin you are using, and add its version. Either use /fawe version or /we version -->
-- [] FAWE version:
-- [] WorldEdit version: 
-
-### Description of the problem:
-<!--- Be as specific as possible.  Don't lie, redact information, or use false names/situations. -->
-<!--- Who, What, When, Where, Why, How, Expected behavior, Resultant behavior, etc -->
-
-### How to replicate:
-<!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
-
-## Additional Information:
-> The information here is optional for you to provide, however it may help us to more readily diagnose any compatibility and bug issues.
-
-### Other plugins being used on the server:
-<!--- Optional but recommended - issue "/plugins" in-game or in console and copy/paste the list -->
-
-### Relevant console output, log lines, and/or screenshots:
-<!--- Please use in-line code insertion 
-```
-like this
-```
-for short (20 lines or less) text blobs, or a paste service for large blobs -->
-
-### Additional relevant comments/remarks:
-<!--- Use this space to give us any additional information which may be relevant to this issue, such as: if you are using a Minecraft hosting provider; unusual installation environment; etc -->
-
-# AFFIRMATION OF COMPLETION:
-<!-- Make sure you have completed the following steps (put an "X" between of brackets): -->
-- [] I included all information required in the sections above
-- [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/PlotSquared/issues?utf8=%E2%9C%93&q=is%3Aissue)
-- [] I made sure I am using an up-to-date version of PlotSquared
-- [] I made sure the bug/error is not caused by any other plugin
-- [x] I didn't read but checked everything above.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: PlotSquared Issue Tracker
+    url: https://issues.intellectualsites.com/projects/ps
+    about: Click here to move to our new issue tracker
   - name: PlotSquared Suggestions
     url: https://github.com/IntellectualSites/PlotSquaredSuggestions
     about: If you want to submit feature or suggestion ideas, do that here

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -491,9 +491,9 @@ public class Settings extends Config {
 
     @Comment("Settings relating to PlotSquared's GlobalBlockQueue")
     public static final class QUEUE {
-        @Comment({"Average time per tick spent completing chunk tasks in ms. Target average TPS = 20 * 50 / TARGET_TIME.",
+        @Comment({"Average time per tick spent completing chunk tasks in ms.",
         "Waits (chunk task time / target_time) ticks before completely the next task."})
-        public static int TARGET_TIME = 65;
+        public static int TARGET_TIME = 40;
     }
 
 

Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java

@@ -57,6 +57,7 @@ public class GlobalBlockQueue {
     private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
         new RunnableVal2<Long, LocalBlockQueue>() {
             @Override public void run(Long free, LocalBlockQueue queue) {
+                long t1 = System.currentTimeMillis();
                 do {
                     boolean more = queue.next();
                     if (!more) {
@@ -66,9 +67,9 @@ public class GlobalBlockQueue {
                         }
                         return;
                     }
-                } while ((lastPeriod =
+                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
-                    ((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
+                    - GlobalBlockQueue.this.last) < free);
-                        - GlobalBlockQueue.this.last)) < free);
+                lastPeriod = System.currentTimeMillis() - t1;
             }
         };
 
@@ -124,8 +125,8 @@ public class GlobalBlockQueue {
                     lastPeriod -= targetTime;
                     return;
                 }
-                SET_TASK.value1 = 50 + Math.min(
+                SET_TASK.value1 = 30 + Math.min(
-                    (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
+                    (30 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
                         System.currentTimeMillis()),
                     GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
                 SET_TASK.value2 = GlobalBlockQueue.this.getNextQueue();

README.md

@@ -28,6 +28,7 @@ is to provide a lag-free and smooth experience.
 * [Download](https://www.spigotmc.org/resources/plotsquared-v5.77506/)
 * [Discord](https://discord.gg/KxkjDVg)
 * [Wiki](https://wiki.intellectualsites.com/plotsquared/home)
+* [Issues](https://issues.intellectualsites.com/projects/ps)
 
 ### Developer Resources
 * [API Documentation](https://wiki.intellectualsites.com/en/plotsquared/developer/development-portal)