N0tMyFaultOG
|
01ff9a34c2
|
Merge branch 'features/v5/placeholders' into v5
|
2020-07-16 18:48:45 +02:00 |
|
Hannes Greule
|
97a356c4a0
|
Very attentive reviewers, can recommend
|
2020-07-16 18:13:02 +02:00 |
|
Hannes Greule
|
10ab28c1ec
|
Add missing license headers
|
2020-07-16 18:08:00 +02:00 |
|
Hannes Greule
|
2d9cf8b759
|
Get placeholders working
|
2020-07-16 18:04:17 +02:00 |
|
N0tMyFaultOG
|
4996d8bcd1
|
Remove left over debugs
|
2020-07-15 14:05:15 +02:00 |
|
NotMyFault
|
e5963a8590
|
Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners
Clean up bukkit listeners by splitting them up
|
2020-07-15 13:35:38 +02:00 |
|
N0tMyFaultOG
|
e8c155763b
|
Register placeholders
|
2020-07-15 12:44:07 +02:00 |
|
Alexander Söderberg
|
34655b8d41
|
Add (untested) MVdWPlaceholderAPI support
|
2020-07-14 20:41:08 +02:00 |
|
Alexander Söderberg
|
8eb903ad72
|
Merge branch 'v5' into v6
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
|
2020-07-14 19:18:08 +02:00 |
|
Alexander Söderberg
|
0294397021
|
Manually resolve a bunch of merge issues
|
2020-07-14 19:10:52 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
510ea56431
|
Finalize DI stuff
|
2020-07-14 18:49:40 +02:00 |
|
Alexander Söderberg
|
1dc4da8beb
|
Fix issues from previous merge
|
2020-07-14 13:21:59 +02:00 |
|
Alexander Söderberg
|
1908588fcb
|
Change expansion author and version
|
2020-07-14 13:17:21 +02:00 |
|
Alexander Söderberg
|
af7db08036
|
Add new placeholder system
|
2020-07-14 13:14:02 +02:00 |
|
Alexander Söderberg
|
33f2ff7e6d
|
Merge branch 'v6' into feature/v6/slf4j
|
2020-07-13 23:11:40 +02:00 |
|
Alexander Söderberg
|
6664d49928
|
Prefix all log messages
|
2020-07-13 23:04:27 +02:00 |
|
Alexander Söderberg
|
a1f262b5b2
|
Fix gradle setup and replace all debug calls
|
2020-07-13 22:51:57 +02:00 |
|
N0tMyFaultOG
|
c6962ef4d2
|
Shift a few more messages to debug
|
2020-07-13 19:56:34 +02:00 |
|
Alexander Söderberg
|
0fa5a16cd0
|
replace remaining debug calls
|
2020-07-12 21:49:05 +02:00 |
|
Alexander Söderberg
|
e88da3cea9
|
Add chunk coordinator
|
2020-07-12 20:58:48 +02:00 |
|
dordsor21
|
14b6f84816
|
fix typos that were c/p over
|
2020-07-12 18:50:04 +01:00 |
|
N0tMyFaultOG
|
ac8841447c
|
6cf2c0ad97 (r40542418)
|
2020-07-12 17:11:25 +02:00 |
|
Alexander Söderberg
|
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 |
|
dordsor21
|
c045ef698c
|
Add license headers and fix method change in PlotSquared.java
|
2020-07-12 11:42:45 +01:00 |
|
Alexander Söderberg
|
5cdb3f4fd5
|
Add missing injection points
|
2020-07-12 12:25:44 +02:00 |
|
dordsor21
|
3a11ffc77a
|
Clean up bukkit listeners by splitting them up
|
2020-07-11 19:03:55 +01:00 |
|
Alexander Söderberg
|
916675fb08
|
Guice progress
|
2020-07-11 17:19:19 +02:00 |
|
Alexander Söderberg
|
6f6cb4b630
|
More DI progress
|
2020-07-11 05:29:41 +02:00 |
|
Alexander Söderberg
|
c0f69f321d
|
Guice progress
|
2020-07-10 22:12:37 +02:00 |
|
Alexander Söderberg
|
55bf41d2da
|
Remove dumdum static access
|
2020-07-10 19:25:05 +02:00 |
|
Alexander Söderberg
|
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 |
|
dordsor21
|
afb72aa102
|
Don't include eggs with spawn*_eggs*
|
2020-07-10 17:31:46 +01:00 |
|
Alexander Söderberg
|
d00dc658df
|
Inject EventDispatcher and PlotListener
|
2020-07-10 18:17:44 +02:00 |
|
Alexander Söderberg
|
2dab7c8dda
|
Inject PlotAreaManager
|
2020-07-10 17:32:07 +02:00 |
|
Alexander Söderberg
|
c37cc40ad9
|
Move annotation in BukkitWorld
|
2020-07-10 12:27:26 +02:00 |
|
Alexander Söderberg
|
5341015cb1
|
Finalize immutable locations and add a platform world implementation
|
2020-07-10 12:21:29 +02:00 |
|
dordsor21
|
5e44bb60c6
|
Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5
|
2020-07-09 22:14:38 +01:00 |
|
dordsor21
|
96740fd282
|
Couple of fixes to road flag logic
|
2020-07-09 21:52:51 +01:00 |
|
Alexander Söderberg
|
b36c6427d1
|
Split failed UUID batches into individual requests in order to identify the invalid UUIDs
|
2020-07-09 20:37:14 +02:00 |
|
Traks
|
cfd389883b
|
Improve piston interaction with area border
|
2020-07-09 20:14:06 +02:00 |
|
Traks
|
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 |
|
Alexander Söderberg
|
699eb71e2a
|
Fix kill-road-mobs. Fixes PS-73
|
2020-07-09 19:46:17 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
904f5485ab
|
Merge remote-tracking branch 'origin/v5' into v5
|
2020-07-09 16:38:53 +02:00 |
|
Alexander Söderberg
|
e05d817482
|
Fix plot owner placeholder. Fixes PS-62.
|
2020-07-09 16:38:46 +02:00 |
|
Traks
|
61de18190f
|
More dispense blocking on roads
|
2020-07-09 12:33:23 +02:00 |
|
dordsor21
|
2936b806f3
|
Allow players to interact on their own plot
|
2020-07-08 17:10:09 +01:00 |
|
Alexander Söderberg
|
c36e311520
|
Continue cleaning up PlotSquared.java
|
2020-07-08 15:09:25 +02:00 |
|
Alexander Söderberg
|
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 |
|
dordsor21
|
e826836c36
|
Merge branch 'v5' into features/v5/road-respect-flags
|
2020-07-07 17:48:46 +01:00 |
|
Alexander Söderberg
|
196df855ac
|
Clean up PlotAreaManager and move a bunch of plot area related logic out of PlotSquared
|
2020-07-07 13:37:03 +02:00 |
|
Alexander Söderberg
|
d76c9dad52
|
Remove access to PlotSquared#IMP and rename IPlotMain to PlotPlatform, then rename PlotSquared#imp() to PlotSquared#platform()
|
2020-07-07 12:56:43 +02:00 |
|
Alexander Söderberg
|
298e65a394
|
Replace remaining references to PlotSquared#log
|
2020-07-06 17:17:46 +02:00 |
|
Alexander Söderberg
|
1c254984c1
|
Replace logging references in Bukkitmain
|
2020-07-05 13:56:54 +02:00 |
|
Hannes Greule
|
b5818bfefc
|
Lazy fix for FancyMessage 1.16
|
2020-07-04 20:25:49 +02:00 |
|
Alexander Söderberg
|
429f5e55c3
|
Add option to disable background caching
|
2020-07-03 13:50:12 +02:00 |
|
Alexander Söderberg
|
0e7a6d7a62
|
Fix typo
|
2020-07-03 13:47:50 +02:00 |
|
dordsor21
|
580212d66d
|
fix build
|
2020-07-01 21:49:53 +01:00 |
|
dordsor21
|
2910176b97
|
Add road flag container
|
2020-07-01 14:53:57 +01:00 |
|
dordsor21
|
c5ec8e1931
|
actually fix all conflicts
|
2020-07-01 14:21:18 +01:00 |
|
dordsor21
|
82a887fd3b
|
Merge branch 'v5' into features/v5/road-respect-flags
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
|
2020-07-01 14:12:16 +01:00 |
|
NotMyFault
|
eff410d1da
|
Merge pull request #2862 from IntellectualSites/bukkit/1.16.1
Update to 1.16.1
|
2020-07-01 12:02:57 +02:00 |
|
MattBDev
|
49c35ec084
|
Resolve NMF's concerns
|
2020-06-29 22:05:32 -04:00 |
|
MattBDev
|
3a2e932d17
|
Add missing mobs from 1.13.2+
|
2020-06-28 18:45:40 -04:00 |
|
MeFisto94
|
bd9bdc9e03
|
Separate the Vault Permission Handling from the Economy Handling
|
2020-06-28 14:28:11 +02:00 |
|
MeFisto94
|
9c3d2cfb02
|
Move the caching and static accessors from EconHandler to PlotMain
|
2020-06-27 06:26:00 +02:00 |
|
MattBDev
|
cb04c183a8
|
Update to 1.16.1
|
2020-06-26 20:38:30 -04:00 |
|
Hannes Greule
|
d1ecf9232e
|
Merge pull request #2859 from FreebuildFR/feature/flag_placeholder
Add placeholders to get the value of a plot flag
|
2020-06-26 02:22:59 +02:00 |
|
EpiCanard
|
e833403e3c
|
Replace split with substring for placeholders
|
2020-06-25 14:08:44 +02:00 |
|
Alexander Söderberg
|
f64026af1a
|
Only initialise EconHandler when economy is enabled and stop accessing the static instance directly.
|
2020-06-24 15:26:06 +02:00 |
|
Alexander Söderberg
|
159b35c717
|
Fix OfflinePlayerUUIDService breaking when no worlds have been loaded.
|
2020-06-24 08:05:06 +02:00 |
|
EpiCanard
|
7fbac4f286
|
Add a second placeholder to support only local flag of current plot
|
2020-06-24 00:51:27 +02:00 |
|
Alexander Söderberg
|
55cf34508a
|
Fix issue where old player objects were not cleaned up properly.
This is caused by an issue with the event order in Spigot (and Spigot derivatives), so the fix is rather hacky.
|
2020-06-23 18:36:53 +02:00 |
|
Alexander Söderberg
|
2b4e2fc793
|
Add plot debugging and make tab completable aliases configurable
|
2020-06-23 11:39:45 +02:00 |
|
EpiCanard
|
14baead342
|
Add placeholder to get the value of a plot flag
|
2020-06-23 01:20:17 +02:00 |
|
Alexander Söderberg
|
2d6e6ceaeb
|
Improve documentation of BukkitMain#wrapPlayer and improve generic types
|
2020-06-22 15:45:57 +02:00 |
|
Alexander Söderberg
|
1dcf8d3995
|
Progress on the debug logging API
|
2020-06-21 15:50:49 +02:00 |
|
PureGero
|
cb969e37a6
|
Don't teleport players; Fixes PS-14
|
2020-06-19 11:36:35 +02:00 |
|
Hannes Greule
|
3e2e61d2be
|
Re-introduce online mode
|
2020-06-13 15:53:03 +02:00 |
|
Hannes Greule
|
b6f1610a7e
|
Provide no suggestions instead of player names for commands
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
e3fbb32399
|
Formatting and documentation
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
ae1427b189
|
Remove usage of SetupObject
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
5165c439fc
|
Add tab completion and fix minor bugs
|
2020-06-11 01:01:00 +02:00 |
|
N0tMyFaultOG
|
d12ecc8616
|
Softdepend on new complementary UUID services
|
2020-06-04 11:41:20 +02:00 |
|
N0tMyFaultOG
|
950640a557
|
Revert "Don't send chat spy to message sender"
This reverts commit a37ab10414.
Let's not break plotchat when plotspy is enabled
|
2020-06-04 11:29:02 +02:00 |
|
N0tMyFaultOG
|
86746e7843
|
Fixed https://issues.intellectualsites.com/issue/PS-26
|
2020-06-03 21:18:46 +02:00 |
|
NotMyFault
|
2c74d2479f
|
Exchange website url
|
2020-06-02 17:06:33 +02:00 |
|
Alexander Söderberg
|
6442922d86
|
Implement some more generic types to make the player objects easier to work with and also create wrapper objects for fake players (NPCs). Potentially fixes PS-27
|
2020-05-27 14:08:48 +02:00 |
|
NotMyFault
|
09327b0128
|
Merge branch 'v5' into features/v5/uuid
|
2020-05-25 13:13:29 +02:00 |
|
Alexander Söderberg
|
28a7d027f6
|
Merge branch 'v5' into features/v5/uuid
|
2020-05-24 21:14:56 +02:00 |
|
Alexander Söderberg
|
46b68e489d
|
Tab complete /p list
|
2020-05-24 21:08:11 +02:00 |
|
Aurora
|
98322d5d11
|
Add BungeePerms UUID service. This should probably work.
|
2020-05-24 14:32:34 +02:00 |
|
Alexander Söderberg
|
7b97130af7
|
Add option to disable legacy cache, also add an option to return "Unknown" when a request cannot be fulfilled (old behaviour)
This should fix issues where lowercase offline mode UUIDs don't have access to their old cache.
|
2020-05-24 05:00:36 +02:00 |
|
Alexander Söderberg
|
cc168d5ae9
|
Fix SQLite table creation statement and add legacy SQLite uuids as a provider
|
2020-05-24 04:48:19 +02:00 |
|
Alexander Söderberg
|
d19df3b6eb
|
Fix offline mode UUIDs
|
2020-05-24 04:28:29 +02:00 |
|
Alexander Söderberg
|
75dbc2db98
|
Fix offline mode UUIDs
|
2020-05-24 04:27:20 +02:00 |
|
Alexander Söderberg
|
2875b050c5
|
Add plugin UUID services. They probably work.
|
2020-05-23 19:43:32 +02:00 |
|
Alexander Söderberg
|
6c6c2b57a1
|
Add options to disable tab completion and extend username completion, also limit the total number of username suggestions to 200 per request
|
2020-05-23 17:20:09 +02:00 |
|
Alexander Söderberg
|
32a55127f1
|
Fix partial area regeneration when using PlotSquared generation.
Also fix issues with region height and road width.
|
2020-05-23 14:32:02 +02:00 |
|