Commit Graph

4390 Commits

Author SHA1 Message Date
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
db37077af7 Make signs able to use captions 2020-07-09 12:58:28 +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
d652225f36 Let players teleport to their merged plots 2020-07-08 19:33:58 +02:00
2936b806f3 Allow players to interact on their own plot 2020-07-08 17:10:09 +01:00
3fa532a3c0 Move message sending into PlotPlayer to make it platform independent 2020-07-08 15:35:58 +02:00
d267d1bb98 Start expiry tasks 2020-07-08 14:35:46 +01:00
9792d4cc4b Remove style.yml 2020-07-08 15:23:33 +02:00
090bd69be5 Merge branch 'v6' into feature/v6/json
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
2020-07-08 15:22:02 +02:00
c36e311520 Continue cleaning up PlotSquared.java 2020-07-08 15:09:25 +02:00
f2191cb731 Save style.yml again 2020-07-08 13:59:31 +02:00
265c10ec1c Remove commands.yml 2020-07-08 13:59:31 +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
5004005c5a Fixes PS-65
EssentialsX uses paperlib 1.0.4 where we compile explicitly against 1.0.2
2020-07-08 12:21:31 +02:00
67a49a2ca7 5.12.3 2020-07-07 21:03:30 +02:00
57127537f7 Add permission check for /plot home 2020-07-07 20:45:52 +02:00
3476522c00 Allow /p v <alias> 2020-07-07 20:45:52 +02:00
3d087b1bbe Fix tab completion and usage 2020-07-07 20:45:52 +02:00
c058614fcc Split visit command into home and visit 2020-07-07 20:45:52 +02:00
9e9db0f1df Merge branch 'features/v5/road-respect-flags' into v5 2020-07-07 17:49:32 +01:00
e826836c36 Merge branch 'v5' into features/v5/road-respect-flags 2020-07-07 17:48:46 +01:00
196df855ac Clean up PlotAreaManager and move a bunch of plot area related logic out of PlotSquared 2020-07-07 13:37:03 +02:00
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
298e65a394 Replace remaining references to PlotSquared#log 2020-07-06 17:17:46 +02:00
078b776f60 Implement console messages 2020-07-05 18:14:29 +02:00
4d61a345c6 Small documentation fixes 2020-07-05 18:06:10 +02:00
dc0358957e Add prefix replacement to messages and skip sending empty messages 2020-07-05 18:02:43 +02:00
42d648e338 Use adventure for titles 2020-07-05 17:57:58 +02:00
1c254984c1 Replace logging references in Bukkitmain 2020-07-05 13:56:54 +02:00
f287cc34e7 Remove json message stuff 2020-07-05 13:46:25 +02:00
c8a8806e7d Component progress. The plugin is **very** broken right now. 2020-07-05 13:41:40 +02:00
d061f728bd Merge remote-tracking branch 'origin/feature/v5/json' into feature/v5/json 2020-07-05 12:44:25 +02:00
b5818bfefc Lazy fix for FancyMessage 1.16 2020-07-04 20:25:49 +02:00
6bf5bc60d1 Update messages_en.json with new placeholders 2020-07-04 18:57:56 +02:00
c784c69eb3 progress 2020-07-04 18:53:03 +02:00
e3759d059a Fixing missing license headers. 2020-07-04 18:03:47 +02:00
429f5e55c3 Add option to disable background caching 2020-07-03 13:50:12 +02:00
0e7a6d7a62 Fix typo 2020-07-03 13:47:50 +02:00
ad1ec42b12 Add new clear pipeline to hpw and make some stuff read access as required. 2020-07-02 14:33:22 +01:00
580212d66d fix build 2020-07-01 21:49:53 +01:00
b71de856a8 allow plugins extending and replacing RegionManager to be notified of, and "accept" plot clear "requests".
.
.
.
.
.
FAWE
2020-07-01 21:49:53 +01:00
35cff29917 Add license header 2020-07-01 17:24:47 +02:00
2910176b97 Add road flag container 2020-07-01 14:53:57 +01:00
c5ec8e1931 actually fix all conflicts 2020-07-01 14:21:18 +01:00
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
eff410d1da Merge pull request #2862 from IntellectualSites/bukkit/1.16.1
Update to 1.16.1
2020-07-01 12:02:57 +02:00
cbe8875b94 Bump gradle version 2020-07-01 11:59:28 +02:00