Commit Graph

3965 Commits

Author SHA1 Message Date
916675fb08 Guice progress 2020-07-11 17:19:19 +02:00
a2ec404014 Fix /plot target nearest 2020-07-11 13:40:22 +01: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
7687d7705b Fix merge issue 2020-07-10 18:38:14 +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
2fb76e6636 Split road and plot paste-on-top settings 2020-07-09 22:39:06 +01:00
5b260ea8da update bukkit pom 2020-07-09 22:33:01 +01:00
55139eb134 Do not respect paste on top for road schematics. 2020-07-09 22:19:23 +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
cf1b027db9 Start making locations immutable 2020-07-09 22:28:46 +02:00
fb050ac3da 5.12.5 2020-07-09 21:15:28 +02:00
b36c6427d1 Split failed UUID batches into individual requests in order to identify the invalid UUIDs 2020-07-09 20:37:14 +02:00
63c308971b Update location block vector on add and subtract 2020-07-09 20:14:06 +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
89cb6450fb Fix issue where PlotPlayer#getLocation returns a mutable location 2020-07-09 20:04:00 +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
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