Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-22 18:46:24 +01:00
Code Issues Projects Releases Wiki Activity
2,034 Commits 18 Branches 81 Tags 11 MiB
2541483ebc
Commit Graph

197 Commits

Author SHA1 Message Date
wizjany
a9cd23c6ef Don't replace in comments and strings when you refactor... 2019-07-02 17:39:21 -04:00
wizjany
8ca01b37a4 Add config to disable villagers getting zapped to witches. 
"weather.disable-villager-witchification"
 2019-06-30 19:58:10 -04:00
wizjany
aa8997aeca Add TP button to /rg list where applicable. 2019-06-30 11:37:50 -04:00
wizjany
b757fcc88b Send CUI changes when using /rg select. 2019-06-27 08:06:09 -04:00
wizjany
7593e1a01c Initial update to 1.14. 2019-06-25 22:12:18 -04:00
wizjany
af3eb85962 Add on-equip blacklist event. 
Note that due to deficiencies in the Bukkit API, the event will attempt
to be overprotective and cancel some events that may not actually result
in the player equipping an item. Maintainable PRs welcome. (i.e. would
rather not have to have a list of slot numbers for various inventories
and match them to items :upside_down:)
 2019-06-25 22:11:33 -04:00
wizjany
6d25513739 Don't allow setting build + passthrough in the flag helper. 
It masks the warning message and too many people mess this up.
 2019-06-22 14:15:21 -04:00
wizjany
fe4f0cfc49 Bump dependencies. 
Also remove intake. Unsure when that was ever used.
 2019-06-13 09:17:20 -04:00
wizjany
029f867a41 Add crop-growth flag/config option. 
Fixes WORLDGUARD-4088.
 2019-05-27 20:42:17 -04:00
wizjany
ce35798f67 Fix issues with sometimes-loaded worlds in location flags. 2019-05-26 02:19:33 -04:00
wizjany
0f989fc1b4 Small config cleanup. 2019-05-25 09:59:52 -04:00
wizjany
c4b31cf085 Allow newlines in blacklist messages with \n. 
Fixes WORLDGUARD-4089.
 2019-05-22 08:16:16 -04:00
wizjany
6e30f98322 Fix unknown group flag unmarshalling. 
i.e. don't.
 2019-05-21 19:44:53 -04:00
wizjany
f516999087 Fix error when group flag existed for non-existent flag. 
Probably caused by bad API usage /shrug.
 2019-05-21 16:31:42 -04:00
wizjany
3e899a70c4 Fix /rg claim. 2019-05-15 19:24:23 -04:00
wizjany
d6c2504bbf Make CPU profiling interval configurable. 
Also lower the default to something more sensible.

Also cleanup unused imports.
 2019-05-14 19:01:47 -04:00
wizjany
d542ba78ff Remove AsyncCommandHelper for new AsyncCommandBuilder. 
Helper suffers from race conditions for short-lived tasks, leading to
some poor UX conditions such as errors not propagating to the user
(because the exception handler wasn't attached to the future yet), or
lack of success messages.

This commit replaces that system by a Builder which takes a callable to
begin, and then takes supervisor, delay message, and the success and
failure messages and handlers as parts of the builder. The success and
failure handlers wrap the callable itself before submitting to the
executor so they will always be run. The supervisor and delay are added
as listeners to the future since they aren't required if the task is
sufficiently short-lived (and to maintain compatibility with the classes
which are now in WorldEdit).

The builder also supports Components for success and failure messages,
as well as consumers of the callable's result or exception for better
customization of output, instead of having to rely on adding a callback
to the future.

The future is still returned for certain special usages.
 2019-05-12 14:40:09 -04:00
wizjany
d4c49a7539 Clean up task monitoring, cancelling, exception handling etc. 
Fixes a few issues such as /wg stopprofile leaving a pseudo-cancelled
task in the supervisor, delaying server shutdowns until profiles finish,
not forwarding exceptions that occur during tasks running correctly, etc.
 2019-05-11 14:23:45 -04:00
wizjany
2e2be7092d Ensure un-marshalled registry flags are always lowercase. 
Possibly old region files still had uppercase entries?

Fixes WORLDGUARD-3949 regression.
 2019-05-11 11:30:46 -04:00
wizjany
ec4c53da77 Minor cleanup. 2019-05-11 11:30:45 -04:00
Matthew Miller
8c345cb64b Updated for Text3 2019-05-06 16:49:33 +10:00
wizjany
461f3e1faf
Merge pull request #404 from TheMolkaPL/stoplag-fix 
Fix activityHaltToggle in /stoplag
 2019-05-05 17:10:37 -04:00
wizjany
6fd7190ff2 Ensure session handler order. 2019-05-05 16:55:27 -04:00
wizjany
c57dd20f24 Brace. 2019-05-05 15:48:42 -04:00
TheMolkaPL
71df9c0011 Fix activityHaltToggle in /stoplag 2019-05-05 16:25:21 +02:00
wizjany
b27f18788c Wrap /rg flags in a task. 2019-05-05 00:02:24 -04:00
wizjany
18365bbe42 Formatting fixes. 2019-05-04 23:21:19 -04:00
wizjany
82451595cb Add greeting-title and farewell-title flags. 
Totally didn't accidentally include the flags in last commit.
Closes WORLDGUARD-4008.
 2019-05-04 22:56:55 -04:00
wizjany
c516eb2174 Add frosted-ice-melt flag, and frosted-ice-form flag. 
Frosted-ice-form is checked with build, meaning it can be set to allow
for non-members to use frost walker, deny for members to not be able to
use frost walker, or none to respect membership.

Reverts behavior of ice-melt flag to pre-7.x behavior.
Apparently this wasn't covered before.

Fixes WORLDGUARD-4077.
Closes #364.
 2019-05-04 20:52:28 -04:00
wizjany
7199b8e70f Add /rg flags command. 
Provides an overview of all flags set on a region, including inherited
values, and allows the user to set or unset flags with a single click.
 2019-05-04 20:52:13 -04:00
wizjany
d9bb321f83 Add more fancy texts and pagination. 
Also some general cleanup.
 2019-04-30 19:53:19 -04:00
Kenzie Togami
7692e30721
Switch to new Exception stuff from WE 2019-04-30 15:24:15 -07:00
Kenzie Togami
5f88bef5ac
Correct print(TextComponent) method 2019-04-30 13:34:45 -07:00
wizjany
5c0be800ae Brace. 2019-04-28 20:43:01 -04:00
TheMolkaPL
ac505f0064 Warn about consequences and add /stoplag confirm 2019-04-28 20:41:20 -04:00
wizjany
2aee42cbf2 Clean up gradle dependencies. Tell me if this breaks downstream builds. 
Either I broke something, or you were using WG's jar for some dep that we
don't consider to be API.
 2019-04-28 20:36:28 -04:00
wizjany
5c8b6d3f95 Lots of fancy texts. 2019-04-28 20:21:38 -04:00
wizjany
36eba9c9dd That's not supposed to be there. 2019-04-26 15:07:36 -04:00
Matthew Miller
50e62bd0e7
Update text for WorldEdit changes (#401) 
* Update for text in WE

* Properly write the legacy converter

* Made the text less thicc

* Update for new text API in WE
 2019-04-25 19:40:01 +10:00
wizjany
1dbd25d15e Add block-trampling flag. 
Applies to turtle eggs and farmland.

Closes WORLDGUARD-4067, WORLDGUARD-3666.

Also do some misc cleanup.
 2019-04-19 23:14:14 -04:00
wizjany
ef2783f30a Add snowman-trails flag. 
Closes WORLDGUARD-3566, #378.

Also clean up some listeners, and the flag listing.
 2019-04-17 21:23:29 -04:00
KisaragiEffective
47fb9bd30d Remove redudant type parameters. 2019-04-08 22:04:02 +09:00
wizjany
44c4e5816f Move log message about loading regions to proper location. 2019-04-02 17:18:44 -04:00
wizjany
41268ca443 Don't break completely if regions fail to load. 2019-04-02 17:13:24 -04:00
wizjany
874e429779 Make input more lenient. Allow specifying TZ other than UTC. 
Also remove 'none' and cleanup LocationFlag.
 2019-03-30 20:07:35 -04:00
JOO200
9c5eee90da Changed to java 8 time api 2019-03-30 18:41:42 -04:00
JOO200
4f088e5bf0 Added TimestampFlag 2019-03-30 18:41:42 -04:00
wizjany
c53ed56b3a Check flag change handlers when world changes. 
Global regions aren't actually part of the ApplicableRegionSet,
so the set difference will be empty even if the global region has changed.
 2019-03-23 12:29:12 -04:00
wizjany
6144ca82ac
Fix removing regions from manager with the REMOVE_CHILDREN strategy. (#397) 
* Added test for removing regions from manager.

* Fix removing regions with REMOVE_CHILDREN strategy.
 2019-03-22 14:20:32 -04:00
wizjany
b2fe4c9c71 Move tests to core. 
(None of them are implementation-specific)
 2019-03-20 17:50:12 -04:00
wizjany
ea47e93323 Really remove deprecated flags. 2019-03-14 18:10:56 -04:00
wizjany
10100bd194 Remove deprecated flags. Make sure we register our flags first. 
Also make enderpearl + chorus fruit flags respect entry/exit deny message flags.
 2019-03-14 18:07:41 -04:00
wizjany
91687dc204 Only check for flag changes when regions change. 
This functionally reverts e5b76a5, though individual classes can change
this behavior on an individual basis by overriding the method.

Also, make time-lock and weather-lock restore only initial values,
which should be more intuitive behavior when multiple regions overlap
with different flag values.
 2019-03-12 18:45:08 -04:00
wizjany
ee7dc27283 Actually report game rule values. 
Was just "<Recursive>" before, which is pretty useless.
 2019-03-07 17:44:20 -05:00
wizjany
ff37cc7935 Add item-frame-rotation flag. 
When set to allow, allows players to rotate item in item frames even if
they wouldn't normally have permissions to modify the item frame.

Fixes WORLDGUARD-3588.
 2019-03-06 19:05:36 -05:00
wizjany
b6e2bca5bc Make chat + command flag handing more sane. 
* Send/receive chat and allowed/blocked cmd flags now respect deny-message flag.
* Added `regions.cancel-chat-without-recipients` option to disable the default behavior.
 2019-03-04 18:53:26 -05:00
wizjany
9ea2312751 Apparently some people see red flag and think those are broken. 
This has unfortunately happened more than 2 times.
 2019-03-02 13:14:01 -05:00
wizjany
cc988c0b5a Minor typo. 2019-03-02 12:43:58 -05:00
wizjany
af93530dbe
Fix region equality across multiple region managers. (#395) 
It is possible, for example when teleporting between two worlds, that
regions in two different managers are compared. If the regions in each
world have the same name, they would return equal. Removing the equals
override will prevent two different regions from seeming equal even if
they are not.
 2019-03-01 21:42:07 -05:00
wizjany
a233be1df8 Sponge simulation now also clears waterlogged blocks. 
Fixes WORLDGUARD-4011.
 2019-02-15 16:00:30 -05:00
wizjany
f9339e144e CSV support was removed 8 years ago. 
Even the migrator is long gone.

056f8a57c7
 2019-02-13 23:30:40 -05:00
wizjany
96e7c43f56 Fix newline parsing in StringFlag. 
This was committed broken 7 years ago and no one told us til today.
 2019-02-11 22:22:41 -05:00
Wizjany
72a392aca2
Moved SquirrelID relocation to core project. (#394) 
This allows projects depending on core to properly use the ProfileService and ProfileResolver without themselves relocating the package.
 2019-01-27 19:47:08 -05:00
wizjany
c6442e6669 Re-enabled checkstyle, do some cleanup. 2019-01-27 16:13:58 -05:00
Wizjany
0102dbb9bc
Move MapFlag to core. (#392) 
Original PR was made before API stuff was moved to core, so when the PR was pulled it ended up back in legacy.
 2019-01-27 13:54:30 -05:00
Matthew Miller
3ea7c9fc08 Added GLIDE and SWIM MoveTypes, and made Horses use RIDE 2019-01-02 17:24:49 +10:00
Matthew Miller
9804c69044 Added an option to block conduit effects 2019-01-02 14:25:43 +10:00
Matthew Miller
fdd9064170
Abstracted the commands away from the Bukkit platform (#391) 
* Start work on abstracting commands out of worldedit-legacy

* A lot more work towards abstract commands

* Move a lot of code to WorldEdit

* Setup the exception converter

* Use WorldEdit styling and move more of the RegionContainer across.

* Abstract away the debug commands and a few other things - Only the matcher to go.

* It compiles

* It now seems to run fine

* Fixed version typo
 2018-12-26 14:32:35 +10:00
Matthew Miller
803c2055c3 Update SquirrelID for JAXB removal. 2018-12-23 12:47:23 +10:00
Matthew Miller
344c6cf814 Minor cleanup of blacklists 2018-12-21 22:33:43 +10:00
Matthew Miller
863f6cc13b Switched to heirarchy object report 2018-12-18 18:13:06 +10:00
Matthew Miller
80aec378d8 Fixed the wrong cache directory being used. 2018-12-10 11:39:03 +10:00
Matthew Miller
015f192193 Added toString to LazyLocation to fix /rg info with the teleport flag. 2018-11-17 16:33:30 +10:00
Matthew Miller
83b375b6e1 Sponges now destroy kelp and seagrass, similar to vanilla behaviour. 2018-11-17 10:15:48 +10:00
Matthew Miller
91696533cf Update to the new Vector system 2018-11-04 16:57:59 +10:00
Matthew Miller
a6261b9071 Added an option to disable particle effects on deny 2018-09-28 12:16:22 +10:00
Matthew Miller
87e5770405 Fixed WorldGuard's player not inheriting properly from WorldEdit. 2018-09-26 14:01:25 +10:00
Matthew Miller
e43daa726a Added bStats 2018-09-20 23:35:55 +10:00
Matthew Miller
b4bda6bfaf NEEDS LATEST WORLDEDIT - Moved report framework to WorldEdit, and made most config values be accessible without the BukkitWorldGuardWorldConfiguration 2018-08-15 12:49:25 +10:00
Matthew Miller
44e3f720de Fixed an EntityType bug and removed more deprecated code. 2018-08-13 22:46:36 +10:00
Matthew Miller
7f47e31686 Fixed UUID migrations sometimes failing. 2018-08-13 22:20:27 +10:00
Matthew Miller
b2e64498a8 Move some more code to core. 2018-08-13 22:20:27 +10:00
Matthew Miller
e31fa306ab Fixed weather flag 2018-08-13 22:20:27 +10:00
Matthew Miller
b850b5caf8 Cleanup some more Bukkit specific code. 2018-08-13 22:20:27 +10:00
Matthew Miller
ba61919168 Added block support to the matchers 2018-08-13 22:20:27 +10:00
Matthew Miller
d8dba47c0f Fixed bugs in the gamemode marshaller. 2018-08-13 22:20:27 +10:00
Matthew Miller
a6cfe7d0c9 Move the lowercase unmarshalling entity code. 2018-08-13 22:20:27 +10:00
Matthew Miller
bd89bd9d2f Fixed a few more migration issues 2018-08-13 22:20:27 +10:00
Matthew Miller
66eb8fa553 Remove the "/" adding code from EntityTypeFlag. 2018-08-13 22:20:27 +10:00
Matthew Miller
dcdd0497d8 Fixed a few permission errors. 2018-08-13 22:20:27 +10:00
Matthew Miller
45a4e59965 Fixed matching with blocks vs items 2018-08-13 22:20:26 +10:00
Matthew Miller
e7ff99ae96 Fixed an issue with flags getting double registered. 2018-08-13 22:20:26 +10:00
Matthew Miller
b10cf6adbc It now runs 2018-08-13 22:20:26 +10:00
Matthew Miller
2e8d14c995 It compiles. 2018-08-13 22:20:26 +10:00
Matthew Miller
6c5319f355 Major work towards 1.13 compat 2018-08-13 22:20:01 +10:00
wizjany
adcc41413d Clean up a few files. 2015-11-13 20:39:50 -05:00
wizjany
3d5ee7b571 Gradle-ize. Prep for Sponge. 
Old Bukkit code can still be found in the worldguard-legacy folder
and built with `gradle worldguard-legacy:build`. Hopefully nothing
got lost in the gradle-ization.
 2015-11-13 19:12:55 -05:00