Commit Graph

889 Commits

Author SHA1 Message Date
510ea56431 Finalize DI stuff 2020-07-14 18:49:40 +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
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
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
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
b5818bfefc Lazy fix for FancyMessage 1.16 2020-07-04 20:25:49 +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
580212d66d fix build 2020-07-01 21:49:53 +01: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
49c35ec084 Resolve NMF's concerns 2020-06-29 22:05:32 -04:00
3a2e932d17 Add missing mobs from 1.13.2+ 2020-06-28 18:45:40 -04:00
bd9bdc9e03 Separate the Vault Permission Handling from the Economy Handling 2020-06-28 14:28:11 +02:00
9c3d2cfb02 Move the caching and static accessors from EconHandler to PlotMain 2020-06-27 06:26:00 +02:00
cb04c183a8 Update to 1.16.1 2020-06-26 20:38:30 -04:00
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
e833403e3c Replace split with substring for placeholders 2020-06-25 14:08:44 +02:00
f64026af1a Only initialise EconHandler when economy is enabled and stop accessing the static instance directly. 2020-06-24 15:26:06 +02:00
f6f26c6102 Fix issue where numbers were sometimes parsed as usernames when they shouldn't be. This commit also fixes an issue where "Not a valid plot ID" was sent twice. 2020-06-24 08:31:23 +02:00
159b35c717 Fix OfflinePlayerUUIDService breaking when no worlds have been loaded. 2020-06-24 08:05:06 +02:00
7fbac4f286 Add a second placeholder to support only local flag of current plot 2020-06-24 00:51:27 +02:00