EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity
3,735 Commits 232 Branches 71 Tags 87 MiB
31b71ade69
Commit Graph

1234 Commits

Author SHA1 Message Date
Alexander Söderberg
4ad90d423d
Fix timeout comment 2020-05-12 12:52:45 +02:00
Alexander Söderberg
d2dae45082
Add leaves to the blacklist 2020-05-12 12:49:39 +02:00
Alexander Söderberg
85c9bd7ceb
Add all sign type to blacklist 2020-05-12 12:24:36 +02:00
dordsor21
d0ee579069 Move backup config section to a more appropriate place 2020-05-12 10:44:34 +01:00
Alexander Söderberg
32c23e6ced
Merge branch 'v5' into backups 2020-05-11 22:27:16 +02:00
Alexander Söderberg
81aaba328a
ENGLISH > ROOT 2020-05-11 22:21:37 +02:00
Alexander Söderberg
3c5dd3d0d2
Merge remote-tracking branch 'origin/v5' into v5 2020-05-11 22:11:29 +02:00
Alexander Söderberg
2dc07d9321
Add a looooot of default disallowed blocks 2020-05-11 22:11:21 +02:00
N0tMyFaultOG
841dd5e189 Update wiki links 2020-05-11 20:27:06 +02:00
Alexander Söderberg
b2bc2887d2
Fix dumdum merge 2020-05-11 20:17:41 +02:00
Alexander Söderberg
e20319f4e1
Merge branch 'v5' into backups 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/configuration/Captions.java
 2020-05-11 20:15:48 +02:00
Alexander Söderberg
d40160d205
Fix javadoc 2020-05-11 20:04:22 +02:00
Alexander Söderberg
f7167d5e83
Fix typo 2020-05-11 20:03:26 +02:00
Alexander Söderberg
282773a43f
Replace Guava methods with stdlib equivalents 2020-05-11 20:02:33 +02:00
Alexander Söderberg
8944be5319
(Complex) command suggestions for /plot set 2020-05-11 19:37:25 +02:00
Alexander Söderberg
df01f9bea7
Add a list of blocks that cannot be used in /plot set <component> 2020-05-11 18:35:06 +02:00
Alexander Söderberg
7a6909dab1
Merge branch 'v5' into backups 2020-05-11 11:19:59 +02:00
Alexander Söderberg
3064ae80d1
Add a keep-inventory flag 2020-05-11 11:19:36 +02:00
dordsor21
06bb6856a8 Fix bad getApplicablePlotArea(Location) code 
- Fixes #2815 alongside 667098268f
 2020-05-11 09:48:18 +01:00
Alexander Söderberg
702caa6feb
Remove rogue line break 2020-05-10 22:09:56 +02:00
Alexander Söderberg
fc74c582bf
Add option to disable deletion of plot backups when the plot is unclaimed 2020-05-10 21:52:57 +02:00
Alexander Söderberg
658361f825
Destroy backups when the plot is uncalimed 2020-05-10 21:31:16 +02:00
Alexander Söderberg
e0c9a802d8
Add automatic backups and implement them /plot clear and /plot set <component>. 2020-05-10 20:31:07 +02:00
Alexander Söderberg
c4a70c0945
Fix tab completion for the backup command 2020-05-10 19:42:42 +02:00
Alexander Söderberg
f7d6ac00e4
Make the backup commands work 2020-05-10 19:20:11 +02:00
Alexander Söderberg
8ed5a21b36
Merge branch 'v5' into backups 2020-05-10 17:03:36 +02:00
Alexander Söderberg
6fb63c9609
Implement backup restoration command. This might work, idk, we'll see. 2020-05-10 16:53:19 +02:00
Alexander Söderberg
079289eb74
Use #getTranslated on GENERIC_UNOWNED 2020-05-10 16:40:12 +02:00
Alexander Söderberg
59f96d4455
Translate all backup failure reasons 2020-05-10 16:39:14 +02:00
Alexander Söderberg
cdab52fcbe
dumdum space go bye bye 2020-05-10 16:04:33 +02:00
Alexander Söderberg
63c9037b10
Fix typo 2020-05-10 16:00:20 +02:00
Alexander Söderberg
bbc86eba39
/plot debug progress 2020-05-10 15:51:27 +02:00
Alexander Söderberg
e0fb6f5440
/plot debug structure 2020-05-10 15:36:20 +02:00
Alexander Söderberg
2bd30af361
Cache both backup profiles and backup objects 2020-05-10 15:12:17 +02:00
NotMyFault
b136f44f12
Merge branch 'v5' into remove-eol-translation-strings 2020-05-10 15:05:58 +02:00
Alexander Söderberg
d0dbb495b0
Add BackupProfile#restoreBackup 2020-05-10 14:58:45 +02:00
Alexander Söderberg
8715a27a93
No backups for merged plots 🐮 2020-05-10 14:41:02 +02:00
Aurélien
503fc44208 Updated according to new translations and old removed 2020-05-10 14:12:56 +02:00
Aurélien
d3bfaeb5a4 Ready for merging ! 
Removed useless space at the end of the file + precision of the date (latest edition)
 2020-05-10 14:12:56 +02:00
Aurélien
7adecd0808 Last fix (removed unused translation + added the missing) 2020-05-10 14:12:56 +02:00
Aurélien
c99e081ae0 Fiexed issues reported by CodeFactor 2020-05-10 14:12:56 +02:00
Aurélien
285b6bf62d Updated and corrected French translation 
Old translation has been reviewed and new v5 flags' translations has been added.
Some mistakes could now remain, I will fix them if needed ;)
Enjoy !
 2020-05-10 14:12:56 +02:00
Alexander Söderberg
723e29cdd0
Continue working on the backup system 2020-05-10 14:02:25 +02:00
dordsor21
e6408b35a2 fix merge auto 2020-05-10 10:44:14 +01:00
Alexander Söderberg
3eb0de68c4
Begin working on the structure for the backup system 2020-05-09 20:05:39 +02:00
N0tMyFaultOG
ae11f0610e Add a few more translation strings for setup wizard 2020-05-09 16:45:32 +02:00
N0tMyFaultOG
198c7ca58d Remove dead translations 2020-05-09 14:04:08 +02:00
Hannes Greule
5a2f70238a Typo 2020-05-06 12:53:27 +01:00
Hannes Greule
8257b0b563 No lazy init when calling toString,equals or hashCode 
That prevents premature initialization as NullBlockCategory
 2020-05-06 12:53:27 +01:00
Hannes Greule
9b997d2195 Make constructor private 2020-05-06 12:53:27 +01:00
Hannes Greule
a19fa1b92c Send a debug message if category not found 2020-05-06 12:53:27 +01:00
Hannes Greule
2c060db9c0 Lazily initialize block tags 2020-05-06 12:53:27 +01:00
dordsor21
a8621a15ad Override setblock setting Pattern in ChunkBlockQueue 
> Should stop NPE during plot analysis
> Without overriding this method, DelegateLocalBlockQueue setblock Pattern is called
> DelegateLocalBlockQueue's setblocks use parent.setBlock, but we set that to null in ChunkBlockQueue
> ChunkBlockQueue is simply just to cache the values from generation to use in analysis
> Therefore there is no need to setblocks in any other Queue implementation
 2020-05-06 12:53:16 +01:00
dordsor21
179e9e1e74 Clean up plot grants and plot auto 
- Correct maths for calculating granted plots, etc etc
- Don't check if the player has the correct number of plots AGAIN on AutoClaimFinishTask. That's dumb.
 2020-05-06 11:39:34 +01:00
dordsor21
df5feff9ec Display the correct number of grants used in auto 2020-05-05 13:50:29 +01:00
dordsor21
9226aaff1f In the interest of debug should show everything, add debug when registering an unknown flag. 2020-05-05 12:57:14 +01:00
dordsor21
afe874a59b try-catch for NPE in purge and fail gracefully if the world is null 
Plausible scenario since purge is often run to remove plots in the DB from removed worlds
Shouls fix #2806
 2020-05-05 11:12:39 +01:00
N0tMyFaultOG
4ad9f12d5d Move plot version to debugpaste top 2020-05-04 23:58:01 +02:00
dordsor21
228c37815a Fix merge all 
Fixes #2804
 2020-05-04 17:15:53 +01:00
dordsor21
729469e030 Add config options for all paper events. 2020-05-02 11:58:32 +01:00
dordsor21
c6dc9ee189 Add some more listeners 
- Also use setShouldAbortSpawn so it doesn't just try forever
 - Add config to enable or disable all paper listeners
 2020-05-02 11:58:32 +01:00
dordsor21
85a75ad868 Yeet that PaperSPiGoT out of here 2020-05-02 11:58:32 +01:00
dordsor21
8ec8b8d803 Add some paper-specific listeners 2020-05-02 11:58:32 +01:00
dordsor21
ed2e9a80ed Fix rare bug where if the plot size was less than 15 and the chunk contained an entire plot, it would generate incorrectly 2020-05-01 20:30:59 +01:00
dordsor21
36948ed351 Move world settings dump to a better location (where all of the fields will actually have been set) 2020-05-01 20:29:35 +01:00
dordsor21
e06429f3b0 Correct world types given to player 2020-05-01 19:18:11 +01:00
MattBDev
fd4a9a16de Execute commands when clicked for expire messages 2020-05-01 13:34:43 -04:00
dordsor21
d6d49e0912 Show suffix in versionString() too 2020-05-01 15:56:35 +01:00
dordsor21
b5de5f30ac Allow suffixes to the version 
- Useful for "PlotSquared-5.10.4-SNAPSHOT" etc
 2020-05-01 15:53:40 +01:00
Alexander Söderberg
135c6f2c15 Send a less obnoxious message if the flag name length exceeds the maximum allowed length 2020-04-30 13:36:03 +02:00
dordsor21
a263fe2f2d Apparently we need to recover from bad flags 2020-04-30 12:15:42 +01:00
dordsor21
cbe46539ca Pick up the rest of the reformating 2020-04-30 11:53:07 +01:00
dordsor21
5e842f1572 Force flag names to be 64 characters or less 
- A few people seem to be on interesting SQL installs. This should fix the issues they have with 767 bytes,
 2020-04-30 11:52:39 +01:00
dordsor21
42106bb97a I didn't get everything first time 2020-04-30 11:33:59 +01:00
dordsor21
e7216d4aef Merge branch 'v5' into reformat 2020-04-30 11:33:31 +01:00
dordsor21
0751e9cea3 Make LiquidFlowFlag an enum 2020-04-30 11:18:28 +01:00
dordsor21
0091580ae0 Reformat it all. 2020-04-30 11:01:52 +01:00
N0tMyFaultOG
894d673c90 Fix tests 2020-04-30 11:32:50 +02:00
dordsor21
577fe3037f Update checker improvements and 5.10.4 
- Add config option to disable poll once it's found an update (true by default)
 - Better PlotVersion stuff can now detect if you're using a later version than the spigot API, and not tell you about it
 2020-04-30 10:17:19 +01:00
dordsor21
8a21334e66 Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5 2020-04-28 11:21:51 +01:00
dordsor21
a130d801d5 schem.intellectualsites.com (just forwards to athion.net but cnamed) 2020-04-28 11:21:30 +01:00
N0tMyFaultOG
a829799b36 Update scripting message 2020-04-25 23:53:46 +02:00
Hannes Greule
5bd53436df Prevent NPE for report comments 2020-04-23 13:44:34 +01:00
dordsor21
9081a5aff6 Fix incorrectly formatted biomes in worlds.yml automagically 2020-04-22 08:22:14 +01:00
N0tMyFaultOG
c8d8fb6aff Reformat premium information 2020-04-21 23:38:56 +02:00
N0tMyFaultOG
6da4994955 Enhance premium verification 2020-04-21 23:06:11 +02:00
N0tMyFaultOG
4780fcd534 Fixes #2782 
Thanks for the contribution :)
 2020-04-21 15:53:38 +02:00
dordsor21
ffee7a518e update default biome to match format WorldEdit accepts. 2020-04-21 09:16:02 +01:00
Cheezybo99
f1d10c96bc Added PERMISSIONS_ADMIN_CHAT_BYPASS enum for the permission plots.admin.chat.bypass allowing users to bypass the plot chat security feature. 2020-04-20 18:55:28 +02:00
Alexander Söderberg
3c8b22688a
I'm dumb. 2020-04-19 21:24:45 +02:00
Alexander Söderberg
cdd1fad85c
Fix github link in debugpaste 2020-04-19 21:22:45 +02:00
Alexander Söderberg
bf5862942a
Disable prefixes for flag info headers and footers and suppress NPE in the update utility 2020-04-18 22:26:13 +02:00
Alexander Söderberg
cbea595fa0
Don't relocate json-simple. 2020-04-18 21:14:44 +02:00
dordsor21
952ea0b090 Fix setowner none (unclaim) 2020-04-18 17:59:45 +01:00
dordsor21
af951ac11c Update upload to debug the content if incorrect properly. 2020-04-18 17:53:45 +01:00
dordsor21
165614efe9 make sure never to have unclaim be an alias of delete. Even if it doesn't work. 2020-04-18 17:44:01 +01:00
dordsor21
95335df84d Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5 2020-04-18 17:22:58 +01:00
dordsor21
100861484a Fix plot claim. 2020-04-18 17:22:51 +01:00
Alexander Söderberg
c206de263b
Merge remote-tracking branch 'origin/v5' into v5 2020-04-18 02:28:29 +02:00
Alexander Söderberg
0c12972c03
Register misc-flags. 2020-04-18 02:28:11 +02:00