Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-03 01:19:42 +01:00
Code Issues Projects Releases Wiki Activity
1,170 Commits 18 Branches 81 Tags 11 MiB
039d174477
Commit Graph

944 Commits

Author SHA1 Message Date
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
TomyLobo
4dd13bd925 Merge pull request #310 from jmhertlein/master 
Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order

Fixes com.sk89q.worldguard.protection.regions.RegionIntersectTest.testIntersection.
 2014-02-28 08:19:30 +01:00
TomyLobo
4ce97bca0e Added a unit test for ProtectedRegion.intersectsEdges. 2014-02-28 00:48:40 +01: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
wizjany
a6888c3767 Respect LIGHTER flag for ignition build checks 2013-03-23 15:19:56 -04:00
wizjany
1bd367ddde Fix one last witherskull/fireball conflict 2013-03-22 19:28:18 -04:00
wizjany
0cf87ae561 Allow cow milking in no-build areas 2013-03-22 15:35:30 -04:00
wizjany
fa80f5f67f Fix infinite durability. 
For whatever reason, the Bukkit API thinks that 'Durability" and "Damage"
are synonymous.
 2013-03-18 13:25:11 -04:00
wizjany
92bb3948a6 Fix for minecart naming 2013-03-16 21:47:31 -04:00
wizjany
b826697aea Add flag check to smelting/mining xp handling 2013-03-15 15:44:34 -04:00
wizjany
89430c13ec Handle TNT Minecarts with tnt flag/settings. 2013-03-15 15:32:57 -04:00
Wizjany
f07acea3e1 Updated to MC 1.5 2013-03-15 14:42:20 -04:00
wizjany
e9402c55e6 Fixed a bunch of small bugs 2013-03-14 18:45:05 -04:00
wizjany
2eb6c76da8 Fix stack issue. 2013-03-13 14:38:28 -04:00
Wizjany
a34e48a145 Added unit test for entry and exit flags to put the matter to rest. 
Also cleaned up a few other things regarding tests.
 2013-03-01 22:20:16 -05:00
Wizjany
2d50659b48 Apply exp flag and config setting to xp bottles. 
"Workaround" for not being able to blacklist exp bottles at the moment.
Although I supposed I could have just fixed that instead, this allows more flexibility.
 2013-02-21 10:20:47 -05:00
Wizjany
327ae2b807 Apply crop trampling setting to all entities. 2013-02-21 10:13:17 -05:00
Luuk Jacobs
e831b7facc Add some command aliases to RegionMemberCommands 2013-02-19 10:24:35 +01:00
Wizjany
dfb6114584 Fix a few wolf issues 2013-01-31 08:23:38 -05:00
Wizjany
460d5d0691 Made wolves respect pvp stuff. Removed some extraneous code. 2013-01-30 15:27:52 -05:00
Wizjany
b5f80351ec Allow a lot of commands to be sent from the console. 
Examples:
 /rg addmem <id> <player> -w <worldname>
 /rg flag <id> <flag> -w <worldname> <flagvalue>
 /rg remove <id> -w <worldname>
Command blocks are currently untested.
List of commands: flag, priority, parent, remove,
 addmember, removemember, addowner, removeowner
 2013-01-30 14:45:29 -05:00
Wizjany
72a9472a57 Add vine growth flag and config option. 2013-01-30 14:02:45 -05:00
Wizjany
7eb820c688 Fixed bug where players could place beds on the borders of regions without permissions 2013-01-30 13:47:48 -05:00
Wizjany
886b279da6 Bugfixes for bonemeal and minecarts. 2013-01-27 22:43:29 -05:00
Wizjany
f2d7135fc5 Check shooter of projectile when one hits a hanging entity 2013-01-25 21:07:11 -05:00
Wizjany
d214a859c3 Check the block that the item frame will end in, not the block the player clicked. 2013-01-21 04:08:17 -05:00
Wizjany
d1e221c2b7 Don't cancel explosion if we only want to clear blocklist. May potentially cause issues with multiple settings overlapping. 2013-01-19 08:46:51 -05:00
Dark Arc
e0e4207a4d Apply a cap to the health and hunger flags to prevent possible exceptions 
If a player's health or hunger is set to higher than its respective maximum CraftBukkit will throw exceptions.
 2013-01-16 14:48:39 -05:00
Wizjany
4398c781c5 Wither skulls should be handled separately from fireballs 2013-01-15 18:23:53 -05:00
Wizjany
3e06000fd9 Workaround for CraftBukkit bug with slab placement 2013-01-15 16:06:42 -05:00
Wizjany
833795ebe1 Add enderchest and anvil to blacklist inventories. 2013-01-14 13:31:54 -05:00
Wizjany
6e270d5ec3 Setting summary-on-start to false reduces much more clutter now 2013-01-13 17:21:51 -05:00
Wizjany
09a9bea3a7 Move enderchest to use flag 2013-01-13 16:10:06 -05:00
Wizjany
035ccee2a6 Fixed placing stuff in flower pots. (derp) 2013-01-13 13:44:54 -05:00
Wizjany
17aa2a4153 Fix region teleport permission 2013-01-13 06:13:41 -05:00
Wizjany
a569d20779 Remove max players flag for now. 
There are currently too many unhandled circumstances
which can easily break this flag such as players
entering region in weird ways (teleporting, falling,
logging in) and states changing. It is also horribly
inefficient at the moment.
 2013-01-13 02:34:34 -05:00
Wizjany
88e01fa083 Fix enderpearl flag properly 2013-01-12 11:39:59 -05:00
Wizjany
a240e5d128 Added config option to block zombies from breaking down doors 2013-01-12 00:25:55 -05:00
Wizjany
0d0ba31d3a Fixes for tripwire, flower pots, wooden buttons, ender chests, and sneaking 2013-01-12 00:25:54 -05:00
Wizjany
e79bb3533d Fireball flag should block blaze fireball ignition too now 2013-01-12 00:25:54 -05:00
Wizjany
f94c4ec831 Mob damage setting/flag blocks poison DoT 2013-01-12 00:25:54 -05:00
Wizjany
d5afb76105 Added config setting and flag to block explosions by plugins. 2013-01-12 00:25:53 -05:00
Wizjany
dd7e9ba05e Add enderpearl flag to prevent players from teleporting to/from regions with enderpearls 2013-01-11 18:21:20 -05:00
Wizjany
ee54698fdb Fix players being able to plant cocoa beans in protected areas 2013-01-11 17:54:29 -05:00
Wizjany
955b0e991c Added MAX_PLAYER and MAX_PLAYER_MESSAGE flags 
Allows setting maximum number of players in a region
and sends a message if a region is at capacity.
 2013-01-11 17:09:15 -05:00
Dilandau
c1b98b9e40 Decrease call to PluginManager in WGBukkit 
If WorldGuard is already found we bypass the call to
the PluginManager and use a cached version.
 2013-01-11 16:16:49 -05:00
Dark Arc
d6939b7916 Allow EnderPearls to damage the player who threw them in no-pvp areas 2013-01-02 19:46:41 -05:00
Dark Arc
5f0ca37879 Add support for blocking sub commands 2013-01-02 19:03:22 -05:00
Wizjany
548bdb7eb5 Attempt to fix item frame issues 2012-12-31 17:03:14 -05:00
Wizjany
5c85f39228 Block snowballs in pvp regions again. Reverts 671fd58568 2012-12-30 15:11:19 -05:00
Wizjany
85b2cbc03a Null check for entity explosions without an entity. 2012-12-29 11:46:24 -05:00
Dark Arc
d016da1895 Resolves WORLDGUARD-2316 TNT still lethal when its damage is disabled 2012-11-24 02:42:28 -05:00
Dark Arc
8593f1c80a Resolves WORLDGUARD-2352 Anvils usable despite the use flag 2012-11-24 02:25:59 -05:00
Dark Arc
0b3c40dc3e Implements WORLDGUARD-2315 Enderdragon portal blocking 2012-11-24 02:17:34 -05:00
sk89q
2e7ecc59c0 Fixed typo where BEACON was COMMAND_BLOCK instead. 2012-11-11 19:08:31 -08:00
sk89q
942ce95dbf Fixed #WORLDGUARD-2297, Beacons are not protected in regions. 2012-11-11 18:45:55 -08:00
sk89q
03f77d5ab7 Fixed #WORLDGUARD-2296, Recent fix for dragon eggs in regions not working for left click. 2012-11-11 18:43:34 -08:00
sk89q
8dec32fa6a Added workaround for #WORLDGUARD-2299, java.lang.IllegalArgumentException: Instant potions cannot be extended. 2012-11-11 18:41:18 -08:00
sk89q
8f409d47d9 Fixed #WORLDGUARD-2289, FlagStateManager is not thread synced with the main thread. 2012-11-11 18:36:08 -08:00
Dark Arc
b8f9ceafbb Resolves comma issue relating to flag listing 
This stops commas from being added when a player types in an invalid flag and the player does not have permission to use one or more of the flag that are listed.
 2012-11-07 14:20:44 -05:00
sk89q
051e0cb811 Fixed regression bug cause item frames and paintings to not be protected. 2012-11-07 09:07:38 -08:00
sk89q
5addfd8975 Added security.deop-everyone-on-join and security.block-in-game-op-command. 2012-11-06 20:32:15 -08:00
sk89q
7f108ce8f0 Changed dragon eggs to be checked like it is a broken block in regions. 2012-11-06 20:19:16 -08:00
sk89q
8c883e1ca8 WGBukkit is not supposed to be there. Now in com.sk89q.worldguard.bukkit. 2012-11-06 19:26:05 -08:00
sk89q
d18fe6ffa0 Worked around bug with water potions causing errors. 2012-11-06 19:21:12 -08:00
sk89q
80a8ac9e98 Added mobs.block-above-ground-slimes to block slimes spawning naturally above ground (in swamps). 2012-11-06 18:49:32 -08:00
Dark Arc
671fd58568 Stop snowball blocking 2012-11-06 18:59:08 -05:00
Dark Arc
c4ea3b59f0 Resolve WORLDGUARD-2281, for Dispensers 2012-11-06 18:44:36 -05:00
Dark Arc
5d5def206d Actually corrected Javadoc 2012-11-06 18:07:26 -05:00
Dark Arc
b2ebbb9b55 Corrected Javadoc 2012-11-06 18:04:22 -05:00
Dark Arc
3734c071bf Fixes WORLDGUARD-2281, NPE on Water Potion Drinking 
This resolves the issue where WorldGuard would throw a NullPointerException when a player drank a potion of water while potion blocking was enabled.
 2012-11-06 18:01:13 -05:00
sk89q
df57d91270 Possibly fixed the ladder setting. 2012-11-05 12:28:40 -08:00
sk89q
4da1741578 kekekeke forgot static in WGBukkit's methods. 2012-11-05 12:22:04 -08:00
sk89q
e6e21caeea Added helper WGBukkit class to get references to WorldGuard in other Bukkit plugins. 2012-11-05 12:12:25 -08:00
sk89q
200d47ab09 Added physics.vine-like-rope-ladders to make ladders work like vines. 2012-11-05 11:32:40 -08:00
sk89q
ab274151d4 Potential fix for WORLDGUARD-2263, mobs.block-{item-frame,painting}-destroy not working. 2012-11-05 11:27:35 -08:00
sk89q
aec1e3a529 Fixed NPE in PlayerInteractEvent due to potion blocking. Fixes WORLDGUARD-2269. 2012-11-05 11:09:14 -08:00
sk89q
5316130ae8 Better handle potion blocking with dispensers/splash potions. 2012-11-04 14:46:36 -08:00
sk89q
fede549b51 Added gameplay.block-potions. 2012-11-04 13:42:55 -08:00
sk89q
1bdd7f9a6b Fixed a tab issue with WorldGuardBlockListener due to the mycelium commit. 2012-11-04 13:12:06 -08:00
sk89q
1ba7d623b4 Adds null check in EntityExplodeEvent's handler, fixing WORLDGUARD-2267. 2012-11-04 13:05:25 -08:00
Gabriel Harris-Rouquette
47902e1177 Added mycelium-spread flags. 2012-11-03 15:31:16 -07:00
sk89q
68a7455496 Added backwards compatibility for versions below MC1.4. 2012-11-03 12:15:43 -07:00
Dark Arc
fcfc3acbb8 Improved Performance of some operations 
Replaced quite a few whiles and fors with for-eachs giving a performance gain. Also fixed a few issues with the MySQLDatabase and made several other minor improvements.
 2012-11-03 00:19:40 -04:00