Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-30 22:44:07 +01:00
Code Issues Projects Releases Wiki Activity
1,272 Commits 18 Branches 81 Tags 11 MiB
5fcd7ddf7a
Commit Graph

647 Commits

Author SHA1 Message Date
sk89q
a35aaf9659 Force __global__ BUILD flag to NONE. 
This is due to the legacy reason of the global region having not
been previously processed as a regular region.
 2014-08-16 13:54:04 -07:00
sk89q
bfb3f9e840 Change state flag defaults to true. 2014-08-16 13:45:16 -07:00
sk89q
91e34601ec Add supervisor/task library in. 2014-08-16 13:42:14 -07:00
sk89q
7481acba8c Updated FlagValueCalculator to treat global regions a lowest priority region. 2014-08-16 13:30:58 -07:00
sk89q
4d43ef5305 Change flags to use ALL as their region group. 2014-08-16 13:08:09 -07:00
sk89q
b1fb143fd4 Add a new (unused for now) flag value implementation. 
It supports region groups and fixes inconsistency issues.
 2014-08-16 02:42:02 -07:00
sk89q
d07e81288a Make the state flag test use a Predicate for membership testing. 2014-08-15 14:16:05 -07:00
sk89q
c0d4ba5c6c Swap the if() in the state flag test to make it more readable. 2014-08-15 13:54:33 -07:00
sk89q
8a11752253 Fix a typo in ApplicableRegionSet and improve docs. 2014-08-15 12:41:28 -07:00
sk89q
1d24be8c34 Rewrite state calculation in ApplicableRegionSet to be easier to read. 2014-08-15 12:30:37 -07:00
sk89q
d3f3489c7e Fix child regions not inheriting parent flags. 
This also fixes a unit test.
 2014-08-15 03:48:25 -07:00
sk89q
3f16fef57e Fix and improve protection handlers. 2014-08-15 01:43:37 -07:00
sk89q
608d782321 Activate debugging listener of the property "worldguard.debug.listener" is true. 2014-08-14 22:23:47 -07:00
sk89q
5d6dad4c6d Don't remove child regions without warning. 
Also add some missing files.

Fixes WORLDGUARD-2311.
 2014-08-14 21:41:44 -07:00
sk89q
28c538e981 Refactor region commands and make the necessary ones run in the background. 2014-08-14 21:24:32 -07:00
sk89q
a35cb9277e Handle CommandException in WorldGuardPlugin.convertThrowable(). 2014-08-14 21:24:02 -07:00
sk89q
e43ce420a3 Make UUID detection in DomainInputResolver reusable. 2014-08-14 21:23:26 -07:00
sk89q
501a7aa77a Add ProtectedRegion.copyFrom(). 2014-08-14 21:22:39 -07:00
sk89q
76f7ac8d8e Remove deprecation on getRegion() in RegionManager. 2014-08-14 21:22:15 -07:00
sk89q
518d5958c9 Update some region commands to run in the background. 2014-08-14 16:21:10 -07:00
sk89q
7e25de38da Update Javadocs in RegionContainer. 2014-08-14 15:20:08 -07:00
sk89q
bf8ef39871 Handle null players in shim method of GlobalRegionManager. 2014-08-14 15:17:00 -07:00
sk89q
cd62af698b Change listeners to use the region query cache. 2014-08-14 14:52:11 -07:00
sk89q
709ce9eb08 Fix a typo in some Javadocs. 2014-08-14 02:46:19 -07:00
sk89q
e24d7ccb10 Change "don't have permission" message for regions. 2014-08-14 02:44:42 -07:00
sk89q
98bbd900cb Rename RegionQuery.testEnabled() -> testState(). 2014-08-14 02:39:42 -07:00
sk89q
19b87b628a Remove use of GlobalRegionManager in RegionProtectionListener. 2014-08-14 02:39:12 -07:00
sk89q
dc2652f87b Implement an ApplicableRegionSet cache. 2014-08-14 02:33:57 -07:00
sk89q
99660920d7 Refactor region API with new RegionContainer object. 2014-08-14 01:24:38 -07:00
sk89q
ad1c10a3e9 Reorganize Bukkit portion of the region API. 2014-08-13 14:06:37 -07:00
sk89q
5b685e71d3 Add ChunkHashTable.awaitCompletion(). 2014-08-13 07:51:13 -07:00
sk89q
5ddc4b9251 Properly convert chunk coordinates in ChunkHashTable. 2014-08-13 01:02:55 -07:00
sk89q
38587a1c61 Add a hash table index for regions that hashes on chunk coordinates. 2014-08-13 00:34:36 -07:00
sk89q
eb23e28c16 Handle Tameable as a cause. 2014-08-12 23:17:36 -07:00
sk89q
4379c7e989 Handle Vehicle.getPassenger() as a parent cause. 2014-08-12 23:15:47 -07:00
sk89q
989ce82c5d Merge branch 'feature/event-abstraction' into feature/region-api-update 2014-08-12 19:49:52 -07:00
sk89q
f92e55e061 Simplfy Cause objects. 2014-08-12 19:48:20 -07:00
sk89q
0fc3d21b90 Add abstracted event debugging listener. 2014-08-11 20:08:56 -07:00
sk89q
26d3645f86 Improve level of event listening. 2014-08-11 20:08:38 -07:00
sk89q
110aa2e56b Clean up docs / code for utility classes. 2014-08-11 17:54:55 -07:00
sk89q
05369b69b6 Reorganize classes into different packages. 2014-08-11 17:51:00 -07:00
sk89q
4a501a49db Abstract events for regions and blacklists further. 2014-08-11 17:48:40 -07:00
Torm
573204caad Fix heal command for players with more health than 20 2014-08-11 00:02:26 +02:00
sk89q
7a01168781 Rewrite region API. Migrations need to be re-implemented. 
This commit, however, adds:

* Better support for background saves and loads.
* Periodical writes of region changes rather than explicit save() calls.
* Rewrite of the MySQL region code.
* Support for partial saves when using MySQL.
* Decoupling of region index implementations and RegionManager.

What still needs to be done includes:

* Background region modification operations (addmember, etc.).
* Unit tests to verify correctness of the partial saving.
* Migration support (to be re-added).
* Better handling when regions are failing to save.
* Testing of the /rg load and /rg save commands.
* Verification of how server shutdown / world unload is handled.
* Verification that thread-unsafe concurrent saves of data is not happening.
 2014-08-08 20:28:49 -07:00
sk89q
b5dfed9e01 Update for dependency package rename. 2014-08-02 23:35:12 -07:00
sk89q
29f804b9f0 Save YAML regions database to a temporary file before renaming. 2014-08-02 21:22:32 -07:00
sk89q
504fceceeb Remove /wg cancelall because it doesn't entirely work yet. 2014-08-02 21:19:05 -07:00
sk89q
9a852f4cbe Fix shutdown guard not working. 2014-08-02 21:08:11 -07:00
sk89q
fafd3aba6a Implement UUID migration. 2014-08-02 21:03:17 -07:00
sk89q
d87a335e85 Disable Flyway validation on migration. 2014-08-02 21:00:02 -07:00
sk89q
471b4496c9 Add task management and improve threaded code. 2014-08-02 18:38:18 -07:00
sk89q
bf48361b10 Switch to Odeum for executors. 2014-08-02 11:24:25 -07:00
sk89q
387431c9c7 Remove both UUID and names from domains for removal commands. 2014-08-02 10:03:41 -07:00
sk89q
9b69c07663 Show name: for legacy names in region domains. 2014-08-02 09:53:35 -07:00
sk89q
81a727fe7f Add support for UUIDs in region commands. 2014-08-02 09:32:30 -07:00
sk89q
189fd15498 Close connections properly in MySQLDatabaseImpl.chooseWorldId(). 2014-08-01 22:32:13 -07:00
sk89q
1a602f2f8a Implement UUID saving/loading support for regions. 
Also fix WORLDGUARD-3117.
 2014-08-01 22:31:58 -07:00
sk89q
7986238936 Add migrations for region MySQL support. 2014-08-01 21:29:40 -07:00
sk89q
a2fc9c94fd Fix NPE when a manager fails to load. 2014-08-01 20:02:50 -07:00
sk89q
51f98c9eb7 Reorganize MySQL region DB and added BoneCP as a dependency. 2014-08-01 19:19:48 -07:00
sk89q
418b8ff6a7 Add support for UUIDs in domains. 2014-08-01 17:36:56 -07:00
zreed
26ac987024 Use table prefix when deleting from region_poly2d_point. 2014-07-29 21:11:44 -04:00
sk89q
e44875532d Fix NPE in BlacklistEntry due to recent refactor. 2014-07-28 21:02:15 -07:00
sk89q
956d1b4248 Add support for data values in the blacklist. 2014-07-28 16:45:43 -07:00
sk89q
f46b1cb138 Change use of integer IDs to "Target" objects in blacklist code. 2014-07-28 15:58:07 -07:00
sk89q
5b5022b0b8 Change blacklist repeated event tracking to use an expiring cache and cause names as keys. 2014-07-28 15:01:01 -07:00
sk89q
d93c7fa09d Add on-dispense blacklist event. 2014-07-28 14:48:30 -07:00
sk89q
2c1d1ef0a3 Remove attachment check because it doesn't really make sense. 2014-07-28 14:45:05 -07:00
sk89q
bf97e41697 Rewrite blacklist code. 2014-07-28 14:38:43 -07:00
sk89q
c0852d63fe Add asynchronous region load/save for YAML databases. 
These changes are intentionally limited so as to maintain backwards
compatibility with existing plugins using WG's API.

Some data structures were changed to CopyOnWrite to ensure thread
safety and the map of regions was changed to a ConcurrentHashMap.

Currently, saving requires making a copy of the regions map which can
cause a delay of a few milliseconds on large data sets.
 2014-07-24 18:49:40 -07:00
sk89q
acc39e11b1 Handle null causes by skipping them. 2014-07-24 17:38:18 -07:00
sk89q
b4880ae982 Modularize potion blocking via the configuration. 2014-07-24 16:08:30 -07:00
Wyatt Childers
1a1acae588 Slight performance optimization to the movement checks to improve performance with slow permissions plugins 2014-07-23 22:26:34 -04:00
sk89q
cd221ea19c Refactor command filter into a unit tested class. 
Also adds support for regex \s as the subcommand delimiter.
 2014-07-21 19:36:25 -07:00
sk89q
abeab91be4 Add messages warning about auto-god mode and auto-amphibious mode. 2014-07-18 18:39:49 -07:00
sk89q
ac88367f6c Handle null custom flags registered by third-party plugins. 
See WORLDGUARD-3094.
 2014-07-13 02:23:04 -07:00
sk89q
f788f0e0d9 Add internal.check-attached-blocks option to check attached blocks. 
This does not check the other way yet (i.e. check if other blocks depend
on the block in question).
 2014-07-12 21:14:26 -07:00
sk89q
9a4bc70cdd Added basic abstracted events. 2014-07-12 20:59:33 -07:00
sk89q
ab46fd6244 Add Guava and jsr305 to dependencies. 2014-07-12 19:38:30 -07:00
sk89q
6deafa660d Cleanup code and add checkstyle configs from WorldEdit. 2014-07-12 19:31:43 -07:00
sk89q
0d2adc5707 Add more detail error messages when parsing regions file. 2014-07-11 13:20:42 -07:00
Albert Pham
b0ed119585 Merge pull request #263 from kukelekuuk00/patch-1 
Add some command aliases to RegionMemberCommands
 2014-07-06 15:55:43 -07:00
sk89q
894a42ea13 Merge pull request #316 from zreed/sqltableprefix 2014-07-06 15:37:26 -07:00
sk89q
d827e01760 Merge pull request #313 from TheCutter/master 2014-07-06 15:09:51 -07:00
sk89q
b298bedea0 Set saturation level to food level with feed flag. 2014-06-26 17:47:14 -07:00
eswick
3bfcd69fd9 Convert region ID to lowercase when saving polygon points to MySQL database. Check number of points in polygonal region before registering it. 
When saving the points of a polygonal region to a MySQL database, the region ID was not converted to lowercase. If a region ID contained a capital letter, upon reload no points would be found, causing an out-of-bounds exception and essentially leaving WorldGuard unuseable.
 2014-06-22 14:13:45 -04:00
Wizjany
c66adf0119 Removed sensitive info from reports. 2014-06-17 23:24:13 -04:00
TheCutter
2119b274fd Merge branch 'master' of https://github.com/sk89q/worldguard 2014-06-14 21:36:06 +02:00
wizjany
22f45c45ee Apply obsidian generator disabling to tripwire. 2014-05-07 13:09:06 -04:00
wizjany
0dd9729b35 Fixed logic error in blocked-cmds for real this time. 
Closes WORLDGUARD-3050.
 2014-04-29 12:01:38 -04:00
wizjany
ff46c2cf54 Fixed logic error in blocked-cmds checkings. 
Closes WORLDGUARD-3048.
 2014-04-26 11:31:24 -04:00
TheCutter
1537fc879e fixed indenation 2014-04-19 15:53:15 +02:00
TheCutter
f00352cde0 updates comments 2014-04-19 11:03:03 +02:00
TheCutter
fdc74b1c0d fixing syntax for guideline 2014-04-18 20:21:48 +02:00
TheCutter
83a3c61b66 fixed memory leak with closing mysql resources 2014-04-18 20:10:32 +02:00
wizjany
4422d536b7 Fixed a compilation error due to a sort-of-but-not-really-breaking bukkit change. 2014-02-28 21:21:00 -05:00
Joshua M Hertlein
ec9712f30e Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order 
ProtectedPolygonRegion returns points in an order such that you could play "connect the dots" and end up with the correct polygon. ProtectedCuboidRegion returns them in an order such that playing connect the dots gives you a Z shape. This breaks the intersectsEdges() function in ProtectedRegion when comparing cuboids. This commit causes ProtectedCuboidRegion::getPoints() to return them in an order consistent with ProtectedPolygonRegion, which makes intersectsEdges() work correctly.
 2014-02-25 13:51:57 -06:00
wizjany
2df3290d38 Fixed snowman trails being treated as snow fall. 2014-01-11 16:08:26 -05:00
wizjany
4805df2f03 Fix being able to use bonemeal to turn tall grass into double plants. 2014-01-08 14:56:59 -05:00
Wizjany
ffda88f193 Fix number of args for migratedb command. 2013-12-14 17:21:07 -05:00
Dark Arc
96a69aa2ef Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world config settings 2013-12-11 00:53:49 -05:00
wizjany
2d90fddbee Check for entities and projectiles removing items from frames too. 2013-12-09 17:46:33 -05:00
wizjany
bbd1a0ef10 Protect items in item frames in protected regions. 2013-12-09 08:40:28 -05:00
md_5
73b9a7fb0d Using checked exceptions for control flow is slow. Lets replace it with an isEmpty check. 2013-12-09 19:22:48 +11:00
wizjany
5f32ebe2de Fix compile-time error due to 23766f20 2013-11-17 21:16:51 -05:00
TomyLobo
d024ed7b81 typos, unused imports 2013-11-17 23:59:02 +01:00
TomyLobo
23766f20dd Transformed the BlockFadeEvent handler into a switch. 2013-11-16 17:35:35 +01:00
TomyLobo
31739c647b Dissolved a .* import. 
Rationale: grepping for qualified class names
 2013-11-16 17:35:35 +01:00
Dark Arc
faa016180a Added a config option to allow explosion flags to only prevent block 
damage
 2013-09-22 15:39:10 -04:00
wizjany
e26238e814 Added formatting codes, &k/l/m/n/o and &x (reset). 2013-08-31 10:07:46 -04:00
wizjany
f8ed1a3e3e Make /rg list default to own regions if the player doesn't have permission otherwise. 2013-08-27 23:36:01 -04:00
Wizjany
d47c255168 Check bypass perms for item-drop flag. 2013-08-20 17:03:00 -04:00
wizjany
d1e7796f81 Added allow-tamed-spawns setting, on by default. 
This will stop WorldGuard from culling tamed animals
in regions with mob-spawning deny when they log in
with their owner.
 2013-08-20 14:58:46 -04:00
wizjany
a15c9d289b There have been bigger non-backwards-compatible changes since. 2013-08-18 18:48:31 -04:00
wizjany
c0f95bebf0 Send item-use blacklist event when right-clicking entities. 2013-08-16 13:17:28 -04:00
wizjany
0a54779fc4 Added snow-fall-blocks option to config to restrict snow fall to certain blocks 2013-08-12 18:09:45 -04:00
wizjany
ac525958c5 Added config option and flag to prevent soil from drying naturally. 2013-08-12 18:06:31 -04:00
wizjany
458cf64501 Fixed addowner/addmember commands adding command artifacts. 
Specifically, "-w <world>" will no longer be added when using it.
This requires WorldEdit with commit cd5f832 or newer.
Additionally fixed a typo: DefaultDomain.removaAll -> removeAll.
 2013-08-03 09:46:29 -04:00
wizjany
4acef77623 Fixed milking cows in protected areas. 
It seems that Bukkit changed the return of the bucket/itemstack
methods in the event, causing WG to think a different bucket was used.
 2013-07-30 11:14:59 -04:00
TomyLobo
d38d7fc492 Changed entity report format slightly. 
This makes it clearer to users what that floating point number means.
 2013-07-30 12:15:28 +02:00
wizjany
2510c3eeb5 Allow players to add newlines (\n) via command, not just manually in yml. 2013-07-25 13:10:16 -04:00
wizjany
326d53fd09 Allow the console to load/save all region managers with one command. 2013-07-25 10:12:03 -04:00
sk89q
6f56cb29a5 Fixed -w flag for /rg load and /rg save. 2013-07-07 12:14:41 -07:00
sk89q
977c7d2f29 Changed DoubleFlag and IntegerFlag to take java.lang.Number objects in unmarshal(). 2013-07-07 11:45:22 -07:00
sk89q
a57c162cd8 Convert heal flags datatype from integer to double. 
Existing data should be cast with no data loss.
 2013-07-07 11:38:03 -07:00
wizjany
60c3ed4f6b Polish the fix from the last commit and straighten some other multiworld issues in the move handler. 2013-06-23 20:17:20 -04:00
wizjany
714e75eb95 Potential fix for broken multiworld states. 2013-06-23 16:35:57 -04:00
Wizjany
636819c801 Revert change to permissions node for flags. 
region.flag.own/member/etc was region.flag.regions.own/member/etc
This shouldn't be changed in between, especially if we maintain compatibility with the other flag node (flag.flags).
 2013-06-20 00:52:59 -03:00
wizjany
9a6c2e0685 Finish reverting changes from earlier 2013-06-10 23:12:06 -04:00
wizjany
736eecc13b Add config option to use player teleports for move events. 
Additionally removed code duplication in Vehicle listener.
 2013-06-08 12:04:58 -04:00
TomyLobo
4718c5dab0 Removed unused imports. 2013-06-07 14:06:07 +02:00
Albert Pham
7e9bd49da2 Added mobs.disable-snowman-trails. 2013-06-02 13:23:01 -07:00
wizjany
a0d0ff0b92 Lighter changes in BlockIgnite as well 2013-06-02 11:19:12 -04:00
wizjany
b41be0c319 Added a static WorldGuardPlugin instance and made the utility methods in RegionCommands static. 2013-06-01 18:14:59 -04:00
wizjany
17a466059e A few changes in the new region commands. 
- Allow setting flags on the global region (bugfix)
- Don't throw permissions errors when listing available flags (bugfix)
- Info command defaults to global region if no others are present (enhancement)
- A few typo and spacing fixes (enhancement)
 2013-06-01 17:39:49 -04:00
wizjany
2d9e95a63e Revert lighter changes for now. This brings back the odd behaviors between flint & steel and fire charges, but makes it more intuitive for protection. 2013-06-01 10:14:56 -04:00
Albert Pham
532a45f9e7 Offering a sacrifice to the gods of pedantry. canX() -> mayX() for permissions. 2013-05-31 22:06:37 -07:00
Albert Pham
d61e32ebb5 Cleaned up RegionCommands, abstracted region permissions. 2013-05-31 21:56:32 -07:00
Albert Pham
b7d38e94c8 Added -a flag to region remove owner/member commands to remove all. 2013-05-29 13:24:40 -07:00
wizjany
54973fdf82 Large patch with lots of changes and fixes. 
- Unified movement checking. Teleporting is now handled by
  entry/exit flags. Additionally, a region movement event is
  much closer to being added.
- Fixed an issue with enderpearls and exit/entry flags conflicting.
- Fixed a null check issue in several commands.
- Fixed allowed and blocked command flags making false matches and
  improved support for blocking/allowing specific command args.
 2013-05-26 17:08:51 -04:00
wizjany
0bee631385 Use getName instead of toString for displaying world name. 2013-05-15 07:56:04 -04:00
wizjany
6283382837 Fixed a few movement flag related issues. 
WG no longer prefixes greeting/farewell flags with '**', allowing people to customize the message.
(Adding &c** to the beginning of the message will give previous behavior)
Removed the "game mode locked" message since it returns false gamemodes when being called inside a player move event.
 2013-05-05 10:57:46 -04:00
Silthus
39bb522051 Fixes heal flag bugs when player.maxHealth > 20 
With the new Bukkit Changes the Player Health can be above 20, this fixes the magic number by using the now built in Bukkit functionality.

Examples of this bug were Health jumping to 1/20 hearts when having a heal-amount: -1
 2013-05-04 11:47:43 +03:00
wizjany
bf80d57abe Add fishing to xp blocker. 2013-04-21 08:59:24 -04:00
wizjany
865b94006a Apply other-explosion flag to entity damage as well. 2013-04-09 17:23:56 -04:00
wizjany
874248f8b5 Fix other explosion flag only clearing blocklist 2013-04-09 12:25:05 -04:00
steffen
cef7d5bb12 Fix explosion check order 
If the explosion is blocked and the block damage is also blocked, it's necessary to block the explosion (which includes the damage) instead of just the block damage.
 2013-04-01 18:34:11 -04:00
wizjany
2a8131780f Don't ignore canceled air right click events. 
Apparently Bukkit pre-cancels them even if they would do something.
 2013-03-31 19:13:05 -04:00
Wizjany
7094f70f4a Remove duplicate check. (derp) 2013-03-31 19:13:04 -04:00
wizjany
df5af6129c Improved lighter handling. 2013-03-23 21:10:30 -04:00