EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity
4,039 Commits 282 Branches 82 Tags
f68eb9c7789fa5d21ee4b80fd3a4cfd6507cc344
Commit Graph

886 Commits

Author SHA1 Message Date
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
Alexander Söderberg
5cdb3f4fd5 Add missing injection points 2020-07-12 12:25:44 +02: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
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
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
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
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
078b776f60 Implement console messages 2020-07-05 18:14:29 +02:00
Alexander Söderberg
4d61a345c6 Small documentation fixes 2020-07-05 18:06:10 +02:00
Alexander Söderberg
dc0358957e Add prefix replacement to messages and skip sending empty messages 2020-07-05 18:02:43 +02:00
Alexander Söderberg
42d648e338 Use adventure for titles 2020-07-05 17:57:58 +02:00
Alexander Söderberg
1c254984c1 Replace logging references in Bukkitmain 2020-07-05 13:56:54 +02:00
Alexander Söderberg
f287cc34e7 Remove json message stuff 2020-07-05 13:46:25 +02:00
Alexander Söderberg
c8a8806e7d Component progress. The plugin is **very** broken right now. 2020-07-05 13:41:40 +02:00
Hannes Greule
b5818bfefc Lazy fix for FancyMessage 1.16 2020-07-04 20:25:49 +02:00
Alexander Söderberg
c784c69eb3 progress 2020-07-04 18:53:03 +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