Commit Graph

916 Commits

Author SHA1 Message Date
5360df6012 Add PlotRangeIterator for the many places where it'll be used. All one of them, in fact. This was not a waste of time. I am very happy I did this. This was worthwhile. Yup. 2020-07-18 16:19:12 +02:00
e80ade65c7 Clean up PlotId 2020-07-18 11:05:16 +02:00
d077fafd29 Some random bukkitutil/worldutil improvements 2020-07-17 23:00:09 +02:00
932052772c Fix edge cases for time conversion 2020-07-17 17:53:30 +02:00
43d058d3db Address comments 2020-07-17 17:53:30 +02:00
020b030667 More fixes 2020-07-17 17:53:30 +02:00
5a3eacde0b Replace method synchronization logic 2020-07-17 17:53:30 +02:00
7f412f5472 Begin work on the task system 2020-07-17 17:53:30 +02:00
8eb903ad72 Merge branch 'v5' into v6
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-14 19:18:08 +02:00
0294397021 Manually resolve a bunch of merge issues 2020-07-14 19:10:52 +02:00
97fed21811 Merge branch 'v6' into feature/v6/platform
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
#	Core/build.gradle
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Claim.java
#	Core/src/main/java/com/plotsquared/core/command/Debug.java
#	Core/src/main/java/com/plotsquared/core/command/DebugExec.java
#	Core/src/main/java/com/plotsquared/core/command/Purge.java
#	Core/src/main/java/com/plotsquared/core/command/Trim.java
#	Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
#	Core/src/main/java/com/plotsquared/core/database/SQLManager.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
#	Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
#	Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
#	Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java
#	Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
#	Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
#	Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java
#	Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegionManager.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
#	Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
2020-07-14 19:05:05 +02:00
510ea56431 Finalize DI stuff 2020-07-14 18:49:40 +02:00
1dc4da8beb Fix issues from previous merge 2020-07-14 13:21:59 +02:00
33f2ff7e6d Merge branch 'v6' into feature/v6/slf4j 2020-07-13 23:11:40 +02:00
6664d49928 Prefix all log messages 2020-07-13 23:04:27 +02:00
a1f262b5b2 Fix gradle setup and replace all debug calls 2020-07-13 22:51:57 +02:00
b109b76120 Nevermind, it doesn't allow for relocations 2020-07-13 20:50:49 +02:00
d141b040d6 Fix relocations 2020-07-13 20:45:04 +02:00
e84d82315c Add log4j config (this might work :p) 2020-07-13 20:39:52 +02:00
c6962ef4d2 Shift a few more messages to debug 2020-07-13 19:56:34 +02:00
0fa5a16cd0 replace remaining debug calls 2020-07-12 21:49:05 +02:00
e88da3cea9 Add chunk coordinator 2020-07-12 20:58:48 +02:00
ac8841447c 6cf2c0ad97 (r40542418) 2020-07-12 17:11:25 +02:00
6cf2c0ad97 Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services 2020-07-12 17:04:30 +02:00
5cdb3f4fd5 Add missing injection points 2020-07-12 12:25:44 +02:00
916675fb08 Guice progress 2020-07-11 17:19:19 +02:00
6f6cb4b630 More DI progress 2020-07-11 05:29:41 +02:00
c0f69f321d Guice progress 2020-07-10 22:12:37 +02:00
55bf41d2da Remove dumdum static access 2020-07-10 19:25:05 +02:00
21ad9a36c8 Merge branch 'v6' into feature/v6/platform
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
#	Core/src/main/java/com/plotsquared/core/location/Location.java
2020-07-10 18:37:18 +02:00
afb72aa102 Don't include eggs with spawn*_eggs* 2020-07-10 17:31:46 +01:00
d00dc658df Inject EventDispatcher and PlotListener 2020-07-10 18:17:44 +02:00
2dab7c8dda Inject PlotAreaManager 2020-07-10 17:32:07 +02:00
c37cc40ad9 Move annotation in BukkitWorld 2020-07-10 12:27:26 +02:00
5341015cb1 Finalize immutable locations and add a platform world implementation 2020-07-10 12:21:29 +02:00
5b260ea8da update bukkit pom 2020-07-09 22:33:01 +01:00
5e44bb60c6 Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5 2020-07-09 22:14:38 +01:00
96740fd282 Couple of fixes to road flag logic 2020-07-09 21:52:51 +01:00
b36c6427d1 Split failed UUID batches into individual requests in order to identify the invalid UUIDs 2020-07-09 20:37:14 +02:00
cfd389883b Improve piston interaction with area border 2020-07-09 20:14:06 +02:00
4576cfd961 Improve piston interaction with plot border
Fixes retracting pistons being able to modify plot borders. Prevents
piston heads from sticking outside plots.
2020-07-09 20:14:06 +02:00
699eb71e2a Fix kill-road-mobs. Fixes PS-73 2020-07-09 19:46:17 +02:00
6b07f38cff Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33. 2020-07-09 16:45:25 +02:00
904f5485ab Merge remote-tracking branch 'origin/v5' into v5 2020-07-09 16:38:53 +02:00
e05d817482 Fix plot owner placeholder. Fixes PS-62. 2020-07-09 16:38:46 +02:00
61de18190f More dispense blocking on roads 2020-07-09 12:33:23 +02:00
1310f9470e 5.12.4 2020-07-08 19:34:08 +01:00
2936b806f3 Allow players to interact on their own plot 2020-07-08 17:10:09 +01:00
c36e311520 Continue cleaning up PlotSquared.java 2020-07-08 15:09:25 +02:00
51bd21a464 Merge branch 'v6' into feature/v6/platform
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
2020-07-08 13:57:33 +02:00