4269 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Alexander Söderberg	5a5c5721cc	fix compiler crashing	2020-07-12 07:38:57 +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
dordsor21	a2ec404014	Fix /plot target nearest	2020-07-11 13:40:22 +01: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	7687d7705b	Fix merge issue	2020-07-10 18:38:14 +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	2fb76e6636	Split road and plot paste-on-top settings	2020-07-09 22:39:06 +01:00
dordsor21	5b260ea8da	update bukkit pom	2020-07-09 22:33:01 +01:00
dordsor21	55139eb134	Do not respect paste on top for road schematics.	2020-07-09 22:19:23 +01: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	cf1b027db9	Start making locations immutable	2020-07-09 22:28:46 +02:00
NotMyFault	fb050ac3da	5.12.5	2020-07-09 21:15:28 +02: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	63c308971b	Update location block vector on add and subtract	2020-07-09 20:14:06 +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	89cb6450fb	Fix issue where PlotPlayer#getLocation returns a mutable location	2020-07-09 20:04:00 +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
Alexander Söderberg	db37077af7	Make signs able to use captions	2020-07-09 12:58:28 +02:00
Traks	61de18190f	More dispense blocking on roads	2020-07-09 12:33:23 +02:00
dordsor21	1310f9470e	5.12.4	2020-07-08 19:34:08 +01:00
Hannes Greule	d652225f36	Let players teleport to their merged plots	2020-07-08 19:33:58 +02:00
dordsor21	2936b806f3	Allow players to interact on their own plot	2020-07-08 17:10:09 +01:00
Alexander Söderberg	3fa532a3c0	Move message sending into PlotPlayer to make it platform independent	2020-07-08 15:35:58 +02:00
dordsor21	d267d1bb98	Start expiry tasks	2020-07-08 14:35:46 +01:00
Alexander Söderberg	9792d4cc4b	Remove style.yml	2020-07-08 15:23:33 +02:00
Alexander Söderberg	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
Alexander Söderberg	c36e311520	Continue cleaning up PlotSquared.java	2020-07-08 15:09:25 +02:00
Alexander Söderberg	f2191cb731	Save style.yml again	2020-07-08 13:59:31 +02:00
Alexander Söderberg	265c10ec1c	Remove commands.yml	2020-07-08 13:59:31 +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
N0tMyFaultOG	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
N0tMyFaultOG	67a49a2ca7	5.12.3	2020-07-07 21:03:30 +02:00
Hannes Greule	57127537f7	Add permission check for /plot home	2020-07-07 20:45:52 +02:00
Hannes Greule	3476522c00	Allow /p v <alias>	2020-07-07 20:45:52 +02:00
Hannes Greule	3d087b1bbe	Fix tab completion and usage	2020-07-07 20:45:52 +02:00