Alexander Söderberg
10dbcbcdbd
Prevent NPE in entityDamage
...
This is done by creating a fake (WE) entity type in the case that the entity type name is null. In these cases, WE has no equivalent.
By doing this, all entity category contains check will fail, and it will default to the PVE check at the bottom of the if-else if chain.
2020-05-12 10:05:47 +02:00
Alexander Söderberg
e8dd5fe903
Merge pull request #2816 from IntellectualSites/backups
...
Plot backup system
2020-05-12 09:40:25 +02: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
3c17b76b1c
Remove dum-dum line break
2020-05-11 11:21:32 +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
N0tMyFaultOG
773a993ee1
Merge branch 'remove-eol-translation-strings' into v5
2020-05-10 17:02:13 +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
667098268f
Almost fix slime pathing?
...
This almost works, there's no real way to do it gracefully because you can't set where the slime should be travelling to nicely, nor can you set rotation etc. Seems to be a fairly large part of the event capability missing from paper.
2020-05-10 12:18:55 +01: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
dd1b944205
Update gradle and remove license header from gradle
2020-05-09 16:47:49 +02:00
N0tMyFaultOG
ae11f0610e
Add a few more translation strings for setup wizard
2020-05-09 16:45:32 +02:00
dordsor21
55fc963673
5.10.6
2020-05-09 13:19:29 +01:00
N0tMyFaultOG
198c7ca58d
Remove dead translations
2020-05-09 14:04:08 +02:00
