Commit Graph

3403 Commits

Author SHA1 Message Date
Alexander Söderberg
255cbbe98f Merge remote-tracking branch 'origin/v4' into v4 2020-02-23 22:57:31 +01:00
Alexander Söderberg
554e3981fd Prevent pasting schematics onto merged plots. 2020-02-23 22:57:24 +01:00
Alexander Söderberg
955dd04dd6
Merge pull request #2697 from hyWse/v4
Plotowner are kicked at "/p deny *" themselves
2020-02-23 22:48:23 +01:00
Alexander Söderberg
4ba1ae9aee Fix blockbucket pattern generation 2020-02-23 21:29:53 +01:00
Alexander Söderberg
e39c7dfcde Fix legacy converter. 2020-02-23 21:10:01 +01:00
Alexander Söderberg
8956aedd20 Disallow swapping ,erged plots 2020-02-23 20:50:23 +01:00
Alexander Söderberg
9eb41f05db Allow redstone to be used in server plot with redstone.disable-offline enabled.
Potentially fixes #2613
2020-02-23 20:06:23 +01:00
Daniel
9b1a035e30
Do not kick any added players on /p deny * 2020-02-23 19:55:24 +01:00
Daniel
f605c0b113
Merge pull request #1 from hyWse/hyWse-patch-1
Do not kick plot owners on "/p deny *"
2020-02-23 17:32:23 +01:00
Daniel
49cd8baa27
Do not kick plot owners on "/p deny *" 2020-02-23 17:30:32 +01:00
NotMyFault
449c9f9416 Remove unused dependencies 2020-02-20 00:09:44 +01:00
NotMyFault
59fdcd0d92 Remove update notifications 2020-02-20 00:01:23 +01:00
Alexander Söderberg
67e5d50e0d Document area getters in PlotAreaManager, and replace y-value with z in the area contains check. 2020-02-19 23:52:34 +01:00
Alexander Söderberg
3ffa6cdb6c Fixes #2654 2020-02-19 23:11:05 +01:00
Alexander Söderberg
989d1c57d6 Merge remote-tracking branch 'origin/v4' into v4 2020-02-19 21:19:59 +01:00
Alexander Söderberg
7f1fbb2d69 Fix biome setting in versions prior to 1.15 2020-02-19 21:19:53 +01:00
Matt
6ea6943c12
Add Gradle wrapper verification 2020-02-19 15:11:00 -05:00
MattBDev
928ee3e3da Use generics instead of the raw class 2020-02-16 16:31:48 -05:00
NotMyFault
5ea03f12fb
Update issue template 2020-02-14 17:54:45 +01:00
MattBDev
99a53cb005 DoogiePC doesn't like trees 2020-02-12 18:57:42 -05:00
MattBDev
d7af409d01 Test another workaround 2020-02-12 18:21:23 -05:00
MattBDev
0304e98b00 Workaround for SPIGOT-5574 2020-02-12 15:42:31 -05: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
MattBDev
1516edbeca Update dependencies
Changed gradle to new group id and repository. Updated paper-api to 1.15.2
2020-02-11 15:25:42 -05:00
NotMyFault
54348d824c Update authors 2020-02-10 17:36:54 +01:00
NotMyFault
f32cb0c16e Merge remote-tracking branch 'origin/dependabot/gradle/v4/org.projectlombok-lombok-1.18.12' into v4 2020-02-10 17:18:02 +01:00
NotMyFault
4a03cb0701 Merge remote-tracking branch 'origin/dependabot/gradle/v4/org.ow2.asm-asm-7.3.1' into v4 2020-02-10 17:17:39 +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
NotMyFault
c31c855952 Update gradle version to 6.1 2020-01-24 18:47:32 +01:00
NotMyFault
312b2ad1a8 Send the bStats ID 2020-01-24 18:10:19 +01:00
NotMyFault
0953b5627e Add bStats plugin version
bStats 1.7 requires plugins to have an ID to submit data.
2020-01-24 16:08:48 +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
f71f481ff3
Compile against 1.15.2 2020-01-22 23:54:37 +01:00
NotMyFault
0ba31ed56b
Update dependencies fitting https pattern 2020-01-21 18:25:46 +01:00
NotMyFault
edc81bc668
Updated branch names for gh actions testing 2020-01-21 15:52:57 +01:00
NotMyFault
7797e33ec5
Update sponsors 2020-01-20 01:24:08 +01:00
NotMyFault
118adb42b9 add hungarian translation 2020-01-14 12:27:23 +01:00
dependabot-preview[bot]
2efe604b9b
Bump asm from 7.2 to 7.3.1
Bumps asm from 7.2 to 7.3.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 08:01:49 +00:00
NotMyFault
cadd0cd9b4
Merge pull request #2660 from IntellectualSites/feature/v4/wildcards-player-args
Improve "everyone" args and update a few command messages
2020-01-10 19:40:01 +01:00
NotMyFault
f3187a465c Oops 2020-01-10 19:38:38 +01:00
NotMyFault
6fe856c002 Merge remote-tracking branch 'origin/dependabot/gradle/v4/junit-junit-4.13' into v4 2020-01-10 19:06:22 +01:00
NotMyFault
9a626ea1de Deprecate metrics methods
Metrics are controlled via bstats config for some time now. The config option in settings.yml has already been deprecated in the past.
2020-01-10 14:18:38 +01:00
NotMyFault
026233b7e7 Update gradlew 2020-01-10 14:07:33 +01:00