Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-02 08:50:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,455 Commits 13 Branches 68 Tags 88 MiB
ce756411cf
Commit Graph

1043 Commits

Author SHA1 Message Date
NotMyFault
24b6b23d25 Bind update notifications to spigot resource updates 
The notification permission could be moved back into the other class, but well
 2020-02-16 01:33:43 +01:00
MattBDev
b16db904cc Removed unused class which should be unbreaking. 2020-02-11 17:09:36 -05:00
MattBDev
4b306d454b Fixed an error with the debug command and added @NotNull to generator methods 2020-02-11 17:06:58 -05:00
MattBDev
e53ea2377c Fixed #2671 
Sort of fixed. I added an if statement to log and return if a certain condition is met. It is unclear if there will be more generation issues as a result.
 2020-02-11 16:52:16 -05:00
MattBDev
f79f2ac29e Tweaks to the world generator 2020-02-11 16:16:56 -05:00
NotMyFault
54348d824c Update authors 2020-02-10 17:36:54 +01:00
dependabot-preview[bot]
76e25953b1 Bump lombok from 1.18.10 to 1.18.12 
Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.10 to 1.18.12.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.10...v1.18.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 08:03:18 +00:00
NotMyFault
2f0bf97162 Fix displaying 1 player remove as players 2020-02-09 01:12:32 +01:00
Hannes Greule
d0b6badf09
Fix DebugClaimTest (#2667) 
* Fix DebugClaimTest

* Remove code causing 3 database updates per plot + errors when using MySQL
 2020-01-31 17:12:06 +00:00
NotMyFault
30f37e1e8b Update /plot info placeholders 2020-01-27 23:39:29 +01:00
NotMyFault
4e1c90bbcc Fixes space between names in plot info (Fixes #2675) 2020-01-27 23:06:42 +01:00
Matt
57af89f1d0
Merge pull request #2652 from SynergyMC/breaking 
Revert teleportation behavior to pre-4.400
 2020-01-22 21:23:25 -05:00
NotMyFault
118adb42b9 add hungarian translation 2020-01-14 12:27:23 +01:00
NotMyFault
f3187a465c Oops 2020-01-10 19:38:38 +01:00
NotMyFault
6ee9d91aef Update requriedTypes 2020-01-10 14:01:28 +01:00
NotMyFault
808a1ed703 Add wildcards to command args 2020-01-10 13:35:59 +01:00
NotMyFault
7142e9e0e3
deprecate metrics settings 2020-01-07 22:45:53 +01:00
zombachu
3aa554c52b Implemented optional specification of teleport causes 
This should have backwards-compatibility for any users of the API but would require an update from anything reimplementing (for whatever reason) the interfaces amended by this commit.
 2020-01-02 18:29:12 -10:00
NotMyFault
42a83b56c3
Add clarification of tp bypass permission node to settings.yml 2020-01-03 01:10:32 +01:00
NotMyFault
0ad2682210 Add update and jvm flags to debugpaste 2019-12-27 16:53:38 +01:00
Alexander Söderberg
3abb35e506 Prevent NPE when trying to set statement = null in SQLManager 
If the statement is null, the `isClosed` check will lead to a NPE. As it's going to be null either way, just ignoring the NPE has no side effects.
 2019-12-20 18:01:36 +01:00
Alexander Söderberg
c6e36fd70e Fix plot biomes. 
When migrating to the WorldEdit Biome types, code was not altered to account for these changes. This lead to configuration parsing breaking, and the `/plot setbiome` command no longer functioning. This fixes #2599.
 2019-12-20 17:37:48 +01:00
MattBDev
9fd29b264e Some logging operations to check for tps loss. 2019-12-15 13:08:02 -05:00
MattBDev
3af05e7960 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-12-09 14:44:16 -05:00
MattBDev
07b6942690 Minor code tweaks 2019-12-09 14:43:53 -05:00
dependabot-preview[bot]
7d8a5213dd Bump okio from 2.2.2 to 2.4.1 
Bumps [okio](https://github.com/square/okio) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases)
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 19:34:28 +01:00
dependabot-preview[bot]
eb09e0a633 Bump okhttp from 3.12.0 to 4.2.2 
Bumps [okhttp](https://github.com/square/okhttp) from 3.12.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.12.0...parent-4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:49:39 +01:00
dependabot-preview[bot]
4e2c90e399 Bump gson from 2.8.0 to 2.8.6 
Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:48:37 +01:00
dependabot-preview[bot]
e5423b5e08 Bump kotlin-stdlib from 1.3.50 to 1.3.61 
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.50 to 1.3.61.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.61/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.50...v1.3.61)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:41:32 +01:00
dependabot-preview[bot]
c1a7844f4a Bump lombok from 1.18.8 to 1.18.10 
Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.8 to 1.18.10.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:36:45 +01:00
NotMyFault
3ba29583fc Add all colors to style.yml 
For further releases , we should aim to get a rid of the styles.yml and $ codes. I've seen a lot of people struggling with them, and if you want to use other formatting codes, you need to yamlize the non yamlized messages, otherwise it won't work properly.
 2019-12-07 17:40:15 +01:00
MattBDev
7760631751 Remove deprecated method from Captions.java 2019-12-06 21:18:56 -05:00
MattBDev
05d6d557b8 Merge remote-tracking branch 'origin/breaking' into breaking 2019-12-06 21:16:19 -05:00
MattBDev
9925a320f5 Fix event listeners 2019-12-06 21:16:09 -05:00
NotMyFault
dca5d84d29 Fixes #2620 2019-12-06 00:28:07 +01:00
MattBDev
7e58f4341e Minor fixes and performance improvement 2019-12-02 17:07:57 -05:00
MattBDev
d8933afb50 Merge remote-tracking branch 'origin/breaking' into breaking 2019-11-28 21:50:31 -05:00
MattBDev
4bb45fc220 Replace ByteArrayUtilities code with Guava and Replace PlotGameMode with WorldEdit equivalent. 2019-11-28 21:50:21 -05:00
NotMyFault
09f913cba4 Enhanced Fixes #2595 
Updating messages and adding new strings that fit better.
 2019-11-28 19:02:58 +01:00
MattBDev
006d730185 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-11-26 18:00:44 -05:00
Jesse Boyd
cf558d8f62
Update DebugPaste.java 2019-11-25 22:40:50 +00:00
Jesse Boyd
a65d546f3b
Fix debugpaste split 2019-11-25 22:38:03 +00:00
Jesse Boyd
cd06dbc915
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-11-22 16:12:01 +00:00
Jesse Boyd
977dfa807f
potentially fix partial world auto 2019-11-22 16:11:48 +00:00
NotMyFault
c14e1d7add Update Settings.java 2019-11-22 12:40:27 +01:00
NotMyFault
7377366372 Updating some debug colors 2019-11-22 12:28:34 +01:00
Jesse Boyd
9c9841663a
Fixes #2595 (leave error) 2019-11-19 01:39:51 +00:00
MattBDev
612e96201c Fixed ItemTypeListFlag issue 2019-11-18 13:43:16 -05:00
MattBDev
d7aa4a0e1f Revert "Fix some flag issues" 
This reverts commit 8b741477
 2019-11-18 13:41:46 -05:00
MattBDev
8b7414770f Fix some flag issues 2019-11-18 11:09:32 -05:00
Jesse Boyd
7623698a00
don't use legacy ids here 2019-11-12 22:31:02 +00:00
Jesse Boyd
c23086259d
Potentially fixes rename issues 
#2450
 2019-11-12 20:48:33 +00:00
Jesse Boyd
765a021ecd
Some flag fixes 
Use ItemType for the flags, since they accept items, not blocks.
Fixes #2571
 2019-11-12 20:38:18 +00:00
Jesse Boyd
322e186c4b
Ignore invalid blocks 2019-11-12 07:32:05 +00:00
Jesse Boyd
7d7414ebb9
Fix for single chance parsing 2019-11-11 19:47:26 +00:00
Jesse Boyd
55d6217c32
Check if WORLDEDIT_RESTRICTIONS is enabled 
Unregister if disabled.
 2019-11-11 19:44:51 +00:00
Jesse Boyd
f797141a29
Update Plot.java 2019-11-10 22:08:03 +00:00
Jesse Boyd
bf4d953f3c
No need to convert to a BlockState here 2019-11-10 18:49:31 +00:00
Jesse Boyd
d34f5cc97e
Config reading/writing 2019-11-10 18:32:32 +00:00
Jesse Boyd
d254633b77
Use patterns instead of BlockBucket 
Still use BlockBucket for loading/saving from config
 2019-11-10 17:47:37 +00:00
Jesse Boyd
1d9ad94822
Fix plot getRegions off by 1 2019-11-10 14:01:12 +00:00
Jesse Boyd
fe438fd62a
swallow stacktrace 2019-11-10 13:29:58 +00:00
Jesse Boyd
93894aca96
Force lowercase 2019-11-10 13:27:37 +00:00
Jesse Boyd
f1b8510708
forgot to find 2019-11-10 13:24:04 +00:00
Jesse Boyd
7dcecf486d
Use regex for block bucket, yay 2019-11-10 13:18:15 +00:00
Jesse Boyd
8c1985f9c0
Split by regex 2019-11-10 13:08:34 +00:00
Jesse Boyd
34eb7d05dc
Print actual value for setup? 2019-11-10 12:45:51 +00:00
Jesse Boyd
729452038b
Check if integer 2019-11-10 12:43:47 +00:00
Alexander Söderberg
1a923063b5
Merge branch 'breaking' into we 2019-11-10 13:18:16 +01:00
Jesse Boyd
c155c65a8f
Remove modifier reflection 
Fixes #2484
 2019-11-10 11:23:25 +00:00
Alexander Söderberg
37280779b0 Make /plot setowner require an argument. Fixes #2501. 2019-11-10 12:06:33 +01:00
Jesse Boyd
ed588476e0
Fix single plot areas 2019-11-08 22:31:01 +00:00
Jesse Boyd
07fcd53bf8
Fixes IntellectualSites/PlotSquaredSuggestions#58 2019-11-08 05:17:51 +00:00
NotMyFault
72c6f1165a
Fix okio 2019-11-07 17:02:08 +01:00
Jesse Boyd
252fdefef3
bad regex replace 2019-11-06 11:39:55 +00:00
Jesse Boyd
2cb734bba2
editsession util 2019-11-04 21:55:40 +00:00
MattBDev
46926a4d99 Merge remote-tracking branch 'origin/breaking' into breaking 2019-11-04 16:20:03 -05:00
Jesse Boyd
88732bb88c
Use CuboidRegion instead of RegionWrapper 2019-11-04 21:08:33 +00:00
Jesse Boyd
ba3ff08d6c
Update BlockStateListFlag.java 2019-11-04 20:17:29 +00:00
Jesse Boyd
8f7f6a4f40
Merge branch 'breaking' into we 2019-11-04 20:17:15 +00:00
Jesse Boyd
7e6dc48d69
imports 2019-11-04 19:58:24 +00:00
Jesse Boyd
37f608258f
Remove PlotBlock 2019-11-04 19:55:55 +00:00
NotMyFault
a25511c849 Add custom translations for special flags 2019-11-04 19:22:54 +01:00
Jesse Boyd
930dee9326
Refactor BlockVector2 2019-11-04 17:44:23 +00:00
NotMyFault
e972cb4c1a Make flag error messages translatable 2019-11-04 00:33:04 +01:00
MattBDev
17e784c283 Revert dependency upgrades 2019-11-01 21:45:06 -04:00
Matt
627ecd2b71
Merge pull request #2542 from mindw0rm/UntrustedVisit 
New plot flag untrusted-visit
 2019-10-31 17:02:48 -04:00
NotMyFault
e29727827d Fix missing word 2019-10-27 16:02:34 +01:00
NotMyFault
1f89948948 Remove unused flags 2019-10-27 16:01:57 +01:00
Alexander Söderberg
3be0be1b60 Make sure DENY_EXIT checks for the admin override permission. Fixes #2411. 2019-10-27 12:11:48 +01:00
Alexander Söderberg
2e15934666 Fix /plot flag set allowing for invalid flag values. (Fixes #2519) 2019-10-27 12:01:04 +01:00
Alexander Söderberg
cb52ee8cfb Make the flag list output message configurable. 2019-10-27 11:55:15 +01:00
Alexander Söderberg
01eee306f1 Fixes #2462 by making flag categories translatable. This reflects (somewhat) recent changes to command categories. 2019-10-27 11:45:18 +01:00
Alexander Söderberg
a601739fbd Improve handling of list flags, which in turn resolves issues where add and remove would allow players to add flags with unrecognized values. 2019-10-27 11:25:33 +01:00
mindw0rm
cb1767347b
Merge branch 'breaking' into UntrustedVisit 2019-10-23 20:51:59 +02:00
mindw0rm
91108a5df9 Merge branch 'breaking' into UntrustedVisit 2019-10-22 17:21:24 +02:00
mindw0rm
e5e522bc31 Merge branch 'breaking' into DenyTeleportBugfix 2019-10-22 17:20:43 +02:00
Matt
8b30d6a7ff
Merge pull request #2537 from IntellectualSites/dependabot/gradle/com.google.code.gson-gson-2.8.6 
Bump gson from 2.8.0 to 2.8.6
 2019-10-19 17:45:28 -04:00
dependabot-preview[bot]
d7d9b1793f
Bump okhttp from 3.14.0 to 4.2.2 
Bumps [okhttp](https://github.com/square/okhttp) from 3.14.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.0...parent-4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-19 21:40:45 +00:00
dependabot-preview[bot]
427cf081e3
Bump okio from 2.2.2 to 2.4.1 
Bumps [okio](https://github.com/square/okio) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases)
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-19 21:37:55 +00:00