diff --git a/LICENSE.txt b/LICENSE.txt index 72d590f5..3460712d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,3 @@ ----------------------------------------------------------------------------- -WorldGuard License ----------------------------------------------------------------------------- GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 @@ -169,8 +166,9 @@ permanent authorization for you to choose that version for the Library. ---------------------------------------------------------------------------- -PRTree License ----------------------------------------------------------------------------- + +This work includes Robert Olofsson's Priority R-Tree implementation, for which +its license is reproduced below. Copyright (c) 2008-2010 Robert Olofsson. All rights reserved. diff --git a/README.md b/README.md index 7273b170..0712d07d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ![WorldGuard](http://static.sk89q.com/readme/worldguard.png) ========== -WorldGuard is a toolbox of various functions, useful for multiplayer servers, that lets you: +WorldGuard is a toolbox of various functions, useful for multiplayer servers, +that lets you: * Protect your server from a number of problems. * Block fire spread, lava spread, endermen, and more. @@ -9,30 +10,32 @@ WorldGuard is a toolbox of various functions, useful for multiplayer servers, th * Assign ownership to areas so only selected individuals can build. * Use a number of useful commands. -WorldGuard is open source and is available under the GNU General Public License v3. +WorldGuard is open source and is available under the GNU Lesser +General Public License v3. Compiling --------- -The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling). +The project is written for Java 6 and our build process makes use of +[Maven](http://maven.apache.org). Detailed compilation information +[can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling). Dependencies are automatically handled by Maven. Contributing ------------ -We happily accept contributions, especially through pull requests on GitHub. Submissions -must be licensed under the GNU General Public License v3. +We happily accept contributions, especially through pull requests on GitHub. Please read CONTRIBUTING.md for important guidelines to follow. -We recommend following our [mailing list](https://groups.google.com/d/forum/sk-dev-discuss), especially if you have some big ideas that you want to implement. +Submissions must be licensed under the GNU Lesser General Public License v3. Links ----- -* [Mailing list](https://groups.google.com/d/forum/sk-dev-discuss) +* [Homepage](http://enginehub.org/worldguard) * [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net) * [Issue tracker](http://youtrack.sk89q.com/issues/WORLDGUARD) * [Continuous integration](http://builds.enginehub.org) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard) -* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard) +* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard) diff --git a/out.txt b/out.txt new file mode 100644 index 00000000..55a3ac44 --- /dev/null +++ b/out.txt @@ -0,0 +1,32 @@ +[INFO] Scanning for projects... +[INFO] +[INFO] ------------------------------------------------------------------------ +[INFO] Building WorldGuard 5.9.1-SNAPSHOT +[INFO] ------------------------------------------------------------------------ +[INFO] +[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ worldguard --- +[INFO] Deleting P:\Projects\MCProjects\WorldGuard\target +[INFO] +[INFO] --- maven-checkstyle-plugin:2.12:check (verify-style) @ worldguard --- +[INFO] Starting audit... +P:\Projects\MCProjects\WorldGuard\src\test\java\com\sk89q\worldguard\protection\RegionEntryExitTest.java:53:16: Name 'vip_player' must match pattern '^[a-z_][a-zA-Z0-9]*$'. +P:\Projects\MCProjects\WorldGuard\src\test\java\com\sk89q\worldguard\protection\RegionEntryExitTest.java:54:16: Name 'builder_player' must match pattern '^[a-z_][a-zA-Z0-9]*$'. +P:\Projects\MCProjects\WorldGuard\src\test\java\com\sk89q\worldguard\protection\regions\RegionIntersectTest.java:58:29: Name 'triangle_overlap' must match pattern '^[a-z_][a-zA-Z0-9]*$'. +P:\Projects\MCProjects\WorldGuard\src\test\java\com\sk89q\worldguard\protection\regions\RegionIntersectTest.java:67:29: Name 'triangle_no_overlap' must match pattern '^[a-z_][a-zA-Z0-9]*$'. +P:\Projects\MCProjects\WorldGuard\src\test\java\com\sk89q\worldguard\protection\regions\RegionIntersectTest.java:76:29: Name 'triangle_overlap_no_points' must match pattern '^[a-z_][a-zA-Z0-9]*$'. +Audit done. + +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD FAILURE +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 4.340s +[INFO] Finished at: Sat Jul 12 19:24:00 PDT 2014 +[INFO] Final Memory: 13M/229M +[INFO] ------------------------------------------------------------------------ +[ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.12:check (verify-style) on project worldguard: Failed during checkstyle execution: There are 5 checkstyle errors. -> [Help 1] +[ERROR] +[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. +[ERROR] Re-run Maven using the -X switch to enable full debug logging. +[ERROR] +[ERROR] For more information about the errors and possible solutions, please read the following articles: +[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException diff --git a/pom.xml b/pom.xml index 6b7ef153..f01e1bd0 100644 --- a/pom.xml +++ b/pom.xml @@ -197,6 +197,90 @@ + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.12 + + + verify-style + validate + + check + + + + + ${basedir}/src + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/src/main/assembly/default.xml b/src/main/assembly/default.xml index dc089086..7cd5acc6 100644 --- a/src/main/assembly/default.xml +++ b/src/main/assembly/default.xml @@ -1,4 +1,23 @@ + + + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ \ No newline at end of file diff --git a/src/main/build/import-control.xml b/src/main/build/import-control.xml new file mode 100644 index 00000000..4ccc25f2 --- /dev/null +++ b/src/main/build/import-control.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/sk89q/worldguard/LocalPlayer.java b/src/main/java/com/sk89q/worldguard/LocalPlayer.java index ce89e0e7..45ea8cf3 100644 --- a/src/main/java/com/sk89q/worldguard/LocalPlayer.java +++ b/src/main/java/com/sk89q/worldguard/LocalPlayer.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java index 5700fa46..d8631081 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java index 18e4ac82..748e099f 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLogger.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLogger.java index 5cc0d184..3f428534 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLogger.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLogger.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java index 243b99ea..73818691 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java index 5bb60526..6ec2518c 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java index 0f35c06e..5fa204ac 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java index 5ef6f564..a889b8be 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java index 293eb387..664b3559 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java index 3ef60dc5..a543ae17 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java index 10de1a01..9c232295 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java index f67e643a..61f981d9 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java index a6f7b4b0..cff7827a 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java index bfce2946..2856148f 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java index 83b55117..34754fc8 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.events; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java index 4113f721..64669dd5 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.loggers; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java index 5d3c7bc1..a8941b40 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java @@ -1,27 +1,24 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.loggers; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sk89q.worldedit.blocks.ItemType; import com.sk89q.worldguard.blacklist.events.BlacklistEvent; import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent; @@ -32,6 +29,9 @@ import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent; import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * * @author sk89q @@ -40,12 +40,12 @@ public class ConsoleLoggerHandler implements BlacklistLoggerHandler { private String worldName; - + private final Logger logger; public ConsoleLoggerHandler(String worldName, Logger logger) { this.worldName = worldName; - this.logger = logger; + this.logger = logger; } public void logEvent(BlacklistEvent event, String comment) { diff --git a/src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java index eeb9f941..a51b1872 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.loggers; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java index 394bf0a7..81e63cf3 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.loggers; diff --git a/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java index a9fbb6e1..a2b6fa25 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.blacklist.loggers; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/AbstractPermissionModel.java b/src/main/java/com/sk89q/worldguard/bukkit/AbstractPermissionModel.java index 188387e8..a885e2ba 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/AbstractPermissionModel.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/AbstractPermissionModel.java @@ -1,25 +1,26 @@ -// $Id$ /* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ package com.sk89q.worldguard.bukkit; import org.bukkit.command.CommandSender; -import org.enginehub.util.PermissionModel; +import com.sk89q.worldguard.internal.PermissionModel; abstract class AbstractPermissionModel implements PermissionModel { diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java index 7c19c600..e98a7314 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java index 57c94be3..b6587797 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java index 20a823d9..eea29a64 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java index c379a54f..a7cf9169 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.bukkit; import com.sk89q.commandbook.CommandBook; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java index d818b7b4..9988a155 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; @@ -60,7 +60,7 @@ public FlagStateManager(WorldGuardPlugin plugin) { * Run the task. */ @Override - public void run() { + public void run() { Player[] players = plugin.getServer().getOnlinePlayers(); ConfigurationManager config = plugin.getGlobalStateManager(); @@ -120,11 +120,11 @@ private void processHeal(ApplicableRegionSet applicable, Player player, return; } if (minHealth == null) { - minHealth = 0.0; - } + minHealth = 0.0; + } if (maxHealth == null) { - maxHealth = player.getMaxHealth(); - } + maxHealth = player.getMaxHealth(); + } // Apply a cap to prevent possible exceptions minHealth = Math.min(player.getMaxHealth(), minHealth); @@ -165,11 +165,11 @@ private void processFeed(ApplicableRegionSet applicable, Player player, return; } if (minHunger == null) { - minHunger = 0; - } + minHunger = 0; + } if (maxHunger == null) { - maxHunger = 20; - } + maxHunger = 20; + } // Apply a cap to prevent possible exceptions minHunger = Math.min(20, minHunger); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java b/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java index 1c631656..f540e0d1 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java @@ -1,24 +1,29 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; +import com.sk89q.worldguard.protection.databases.CSVDatabase; +import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; +import com.sk89q.worldguard.protection.managers.RegionManager; +import org.bukkit.World; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -26,18 +31,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.bukkit.World; - -import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; -import com.sk89q.worldguard.protection.databases.CSVDatabase; -import com.sk89q.worldguard.protection.managers.RegionManager; /** * Utility methods for porting from legacy versions. - * - * @author sk89q */ -public class LegacyWorldGuardMigration { +public final class LegacyWorldGuardMigration { + + private LegacyWorldGuardMigration() { + } /** * Port over the blacklist. @@ -66,7 +67,7 @@ public static void migrateBlacklist(WorldGuardPlugin plugin) { plugin.getLogger().warning("blacklist.txt has been converted " + "for the main world at " + newPath + ""); plugin.getLogger().warning("Your other worlds currently have no " + - "blacklist defined!"); + "blacklist defined!"); } } diff --git a/src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java b/src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java index 9c276a0e..5bf5c60a 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/RegionPermissionModel.java b/src/main/java/com/sk89q/worldguard/bukkit/RegionPermissionModel.java index a78f5b50..44b07c0d 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/RegionPermissionModel.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/RegionPermissionModel.java @@ -1,20 +1,21 @@ -// $Id$ /* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java index 8962f647..5ddb3f3b 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; @@ -29,7 +29,10 @@ import com.sk89q.worldguard.protection.flags.StateFlag; import com.sk89q.worldguard.protection.managers.RegionManager; -public class RegionQueryUtil { +public final class RegionQueryUtil { + + private RegionQueryUtil() { + } public static boolean isInvincible(WorldGuardPlugin plugin, Player player) { return isInvincible(plugin, player, null); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java index 87c187ff..c25d234f 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/SpongeUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/SpongeUtil.java index f3661379..c596630c 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/SpongeUtil.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/SpongeUtil.java @@ -1,30 +1,33 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; +import org.bukkit.World; + import static com.sk89q.worldguard.bukkit.BukkitUtil.isBlockWater; import static com.sk89q.worldguard.bukkit.BukkitUtil.setBlockToWater; -import org.bukkit.World; +public final class SpongeUtil { -public class SpongeUtil { + private SpongeUtil() { + } /** * Remove water around a sponge. diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java b/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java index 2348908c..4c91ca99 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java @@ -1,20 +1,21 @@ -// $Id$ /* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index c940f4da..608e7e39 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -1,19 +1,19 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index 08fd3b31..f08840a5 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.bukkit; import static com.sk89q.worldguard.bukkit.BukkitUtil.*; @@ -266,7 +267,7 @@ public void onBlockFromTo(BlockFromToEvent event) { } if (wcfg.disableObsidianGenerators && (isAir || isLava) - && (blockTo.getTypeId() == BlockID.REDSTONE_WIRE + && (blockTo.getTypeId() == BlockID.REDSTONE_WIRE || blockTo.getTypeId() == BlockID.TRIPWIRE)) { blockTo.setTypeId(BlockID.AIR); return; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardCommandBookListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardCommandBookListener.java index 698438ba..7727ba6d 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardCommandBookListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardCommandBookListener.java @@ -1,18 +1,19 @@ /* - * WorldGuard - * Copyright (C) 2012 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java index bd30e6aa..8444aee0 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.bukkit; import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardHangingListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardHangingListener.java index 00d28430..375416ed 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardHangingListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardHangingListener.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index f53c753c..a0ba0542 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.bukkit; import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector; @@ -841,7 +842,7 @@ private void handleBlockRightClick(PlayerInteractEvent event) { || type == BlockID.MELON_STEM || type == BlockID.POTATOES || type == BlockID.CARROTS - || type == BlockID.COCOA_PLANT + || type == BlockID.COCOA_PLANT || type == BlockID.LONG_GRASS)) { if (!plugin.getGlobalRegionManager().hasBypass(player, world) && !set.canBuild(localPlayer)) { diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index cbd9c6fe..0a711c2c 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -1,19 +1,19 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardServerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardServerListener.java index aa6d5259..6ab068bb 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardServerListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardServerListener.java @@ -1,3 +1,22 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.bukkit; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardVehicleListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardVehicleListener.java index 073ecf1e..2f95575a 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardVehicleListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardVehicleListener.java @@ -1,8 +1,22 @@ -// $Id$ /* - * Copyright (C) 2010 sk89q - * All rights reserved. -*/ + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.bukkit; import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java index d2ca7b19..a3019a96 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.bukkit; import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java index 3cd0d0ae..9b94ede4 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java @@ -1,8 +1,22 @@ -// $Id$ /* - * Copyright (C) 2010 sk89q - * All rights reserved. -*/ + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.bukkit; import org.bukkit.World; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java index b9f16c36..dfd6ccaf 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java index 4430ca9b..136a66b6 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java index 575f8253..cef740e7 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java @@ -1,20 +1,21 @@ -// $Id$ /* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ package com.sk89q.worldguard.bukkit.commands; @@ -852,7 +853,8 @@ public void flag(CommandContext args, CommandSender sender) throws CommandExcept } sender.sendMessage(ChatColor.RED + "Unknown flag specified: " + flagName); - sender.sendMessage(ChatColor.RED + "Available flags: " + list); + sender.sendMessage(ChatColor.RED + "Available " + + "flags: " + list); return; } @@ -922,7 +924,7 @@ public void flag(CommandContext args, CommandSender sender) throws CommandExcept existing.setFlag(groupFlag, null); sender.sendMessage(ChatColor.YELLOW + "Region group flag for '" + foundFlag.getName() + "' reset to " + - "default."); + "default."); } else { existing.setFlag(groupFlag, groupValue); sender.sendMessage(ChatColor.YELLOW @@ -1016,7 +1018,7 @@ public void setParent(CommandContext args, CommandSender sender) throws CommandE RegionPrintoutBuilder printout = new RegionPrintoutBuilder(parent); printout.append(ChatColor.RED); printout.append("Uh oh! Setting '" + parent.getId() + "' to be the parent " + - "of '" + child.getId() + "' would cause circular inheritance.\n"); + "of '" + child.getId() + "' would cause circular inheritance.\n"); printout.append(ChatColor.GRAY); printout.append("(Current inheritance on '" + parent.getId() + "':\n"); printout.appendParentTree(true); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java index ae778b1e..2620938a 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java @@ -1,20 +1,21 @@ -// $Id$ /* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java index 4cea7e5a..14da9449 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionPrintoutBuilder.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionPrintoutBuilder.java index 39114a46..c193e486 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionPrintoutBuilder.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionPrintoutBuilder.java @@ -1,20 +1,21 @@ -// $Id$ /* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java index e03843f8..3a7b178e 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java index ff819ce5..9e7fab21 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.bukkit.commands; diff --git a/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java b/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java index 4f49b2d2..94fe6ed0 100644 --- a/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java +++ b/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java @@ -1,19 +1,19 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java index 482f74fe..e31d7de5 100644 --- a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java +++ b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.chest; diff --git a/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java b/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java index 60653c61..0dee87dc 100644 --- a/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java +++ b/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.domains; diff --git a/src/main/java/com/sk89q/worldguard/domains/Domain.java b/src/main/java/com/sk89q/worldguard/domains/Domain.java index dfc679a9..7eaca201 100644 --- a/src/main/java/com/sk89q/worldguard/domains/Domain.java +++ b/src/main/java/com/sk89q/worldguard/domains/Domain.java @@ -1,3 +1,22 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.domains; import com.sk89q.worldguard.LocalPlayer; diff --git a/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java b/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java index 0668c428..f34ec5f7 100644 --- a/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java +++ b/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.domains; diff --git a/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java b/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java index 049e0ae0..c5edb7d7 100644 --- a/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java +++ b/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.domains; diff --git a/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java b/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java index d6972d74..0c50a338 100644 --- a/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java +++ b/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.domains; diff --git a/src/main/java/com/sk89q/worldguard/internal/PermissionModel.java b/src/main/java/com/sk89q/worldguard/internal/PermissionModel.java new file mode 100644 index 00000000..3b52b100 --- /dev/null +++ b/src/main/java/com/sk89q/worldguard/internal/PermissionModel.java @@ -0,0 +1,24 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.internal; + +public interface PermissionModel { + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java b/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java index 3448f905..fd9c966d 100644 --- a/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java +++ b/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection; import com.sk89q.worldguard.LocalPlayer; diff --git a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java index f9a87810..213c10c3 100644 --- a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection; import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector; diff --git a/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java b/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java index 033c9752..2f631c1b 100644 --- a/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java +++ b/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java index 94235456..be0b329d 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java index 4329c525..9e9fd196 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java b/src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java index a7092abe..7b6e53d2 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java @@ -1,11 +1,30 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.protection.databases; import com.sk89q.worldguard.util.FatalConfigurationLoadingException; public class InvalidTableFormatException extends FatalConfigurationLoadingException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - protected String updateFile; + protected String updateFile; public InvalidTableFormatException(String updateFile) { super(); @@ -14,7 +33,7 @@ public InvalidTableFormatException(String updateFile) { } public String toString() { - return "You need to update your database to the latest version.\n" + - "\t\tPlease see " + this.updateFile; + return "You need to update your database to the latest version.\n" + + "\t\tPlease see " + this.updateFile; } } diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java index f6cecefa..215c1aa4 100755 --- a/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; @@ -1027,7 +1027,7 @@ private void updatePoly2dPoints(ProtectedPolygonalRegion region) throws SQLExcep PreparedStatement clearPoly2dPointsForRegionStatement = null; PreparedStatement insertPoly2dPointStatement = null; - try { + try { clearPoly2dPointsForRegionStatement = this.conn.prepareStatement( "DELETE FROM `region_poly2d_point` " + "WHERE `region_id` = ? " + diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java index 3427f6ed..bad10645 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabaseException.java b/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabaseException.java index b27c5a49..b4f2f883 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabaseException.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabaseException.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard ProtectionDatabaseException - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java b/src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java index dde29b2b..14241efd 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java index d1e14d0c..d8f8045a 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/AbstractDatabaseMigrator.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/AbstractDatabaseMigrator.java index f01556bd..549fdaea 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/AbstractDatabaseMigrator.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/AbstractDatabaseMigrator.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases.migrators; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/DatabaseMigrator.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/DatabaseMigrator.java index 91c3c8a4..838170d0 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/DatabaseMigrator.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/DatabaseMigrator.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases.migrators; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigrationException.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigrationException.java index 398d3a2b..9ce01b43 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigrationException.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigrationException.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases.migrators; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigratorKey.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigratorKey.java index 99d99452..5fe0e8bf 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigratorKey.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigratorKey.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases.migrators; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java index 62e92f59..370e9e32 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases.migrators; diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java index 7c188735..8b6dc950 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java @@ -1,21 +1,21 @@ -// $Id$ /* - * MySQL WordGuard Region Database - * Copyright (C) 2011 Nicholas Steicke + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.databases.migrators; diff --git a/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java b/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java index 384dc6c8..6f8a7a36 100644 --- a/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java +++ b/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java @@ -1,19 +1,19 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java index 88ba8ab1..9f54e92a 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java index 3966fdfd..e7793bcd 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java index d83166e1..e22bbd4a 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java @@ -1,19 +1,19 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java index 93cd1358..00773b61 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; @@ -53,7 +54,7 @@ public Double unmarshal(Object o) { if (o instanceof Double) { return (Double) o; } else if (o instanceof Number) { - return ((Number) o).doubleValue(); + return ((Number) o).doubleValue(); } else { return null; } diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java index c0c29003..f6abc7b0 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.entity.EntityType; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java index 895ee880..d4cff48d 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java b/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java index caddae14..6ecf5bf0 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java index 23c0e23d..5da67b34 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; @@ -53,7 +54,7 @@ public Integer unmarshal(Object o) { if (o instanceof Integer) { return (Integer) o; } else if (o instanceof Number) { - return ((Number) o).intValue(); + return ((Number) o).intValue(); } else { return null; } diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java b/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java index 5f27c1f3..d49778eb 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.flags; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java index fa42881d..4dac3a46 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import java.util.HashMap; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java b/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java index 0c855ffb..0d7f6e55 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java @@ -1,18 +1,19 @@ /* - * WorldGuard - * Copyright (C) 2012 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java index d43ae50f..8003bd76 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import com.sk89q.worldguard.LocalPlayer; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java index 99a51afb..6d2d5639 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import java.util.ArrayList; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java index 6174aac5..eeda9aab 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java index e6d4ff9a..7e22473f 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java index f9aa656c..e5d3d25e 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.flags; import java.util.HashMap; diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java index 9b70f68c..7cdc8926 100644 --- a/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.managers; import com.sk89q.worldedit.Vector; diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java index 83eb7d78..4ed3ad26 100644 --- a/src/main/java/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.managers; import com.sk89q.worldedit.Vector; diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java index 6f463346..b4990468 100644 --- a/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java @@ -1,19 +1,19 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java index 08be603e..7b32b6bc 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java +++ b/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.regions; diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java index f194e183..767054bc 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java +++ b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.regions; import java.util.ArrayList; diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java index e4a551ef..7b6d474b 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java +++ b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java @@ -1,21 +1,22 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ + package com.sk89q.worldguard.protection.regions; import java.util.ArrayList; diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java index 222382b9..f660984e 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java +++ b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.regions; diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java index b56c76a5..006c0431 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java +++ b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection.regions; diff --git a/src/main/java/com/sk89q/worldguard/util/ArrayReader.java b/src/main/java/com/sk89q/worldguard/util/ArrayReader.java index 37b187a3..f5466851 100644 --- a/src/main/java/com/sk89q/worldguard/util/ArrayReader.java +++ b/src/main/java/com/sk89q/worldguard/util/ArrayReader.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.util; diff --git a/src/main/java/com/sk89q/worldguard/util/FatalConfigurationLoadingException.java b/src/main/java/com/sk89q/worldguard/util/FatalConfigurationLoadingException.java index 6c10cc9d..dae3981a 100644 --- a/src/main/java/com/sk89q/worldguard/util/FatalConfigurationLoadingException.java +++ b/src/main/java/com/sk89q/worldguard/util/FatalConfigurationLoadingException.java @@ -1,6 +1,25 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.util; public class FatalConfigurationLoadingException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/sk89q/worldguard/util/LogListBlock.java b/src/main/java/com/sk89q/worldguard/util/LogListBlock.java index 936d5a88..d6732449 100644 --- a/src/main/java/com/sk89q/worldguard/util/LogListBlock.java +++ b/src/main/java/com/sk89q/worldguard/util/LogListBlock.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.util; @@ -23,8 +23,9 @@ import java.util.Map; public class LogListBlock { - private LinkedHashMap items - = new LinkedHashMap(); + + private LinkedHashMap items = new LinkedHashMap(); + private int maxKeyLength = 0; private void updateKey(String key) { @@ -125,4 +126,5 @@ protected String getOutput(String prefix) { public String toString() { return getOutput(""); } + } \ No newline at end of file diff --git a/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java b/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java index 810ad1e6..9efbad19 100644 --- a/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java +++ b/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.util; @@ -28,10 +28,13 @@ import java.net.URL; import java.net.URLEncoder; -public class PastebinPoster { +public final class PastebinPoster { private static final int CONNECT_TIMEOUT = 5000; private static final int READ_TIMEOUT = 5000; - + + private PastebinPoster() { + } + public static void paste(String code, PasteCallback callback) { PasteProcessor processor = new PasteProcessor(code, callback); Thread thread = new Thread(processor); diff --git a/src/main/java/com/sk89q/worldguard/util/RegionUtil.java b/src/main/java/com/sk89q/worldguard/util/RegionUtil.java index d40128fd..3dc0426e 100644 --- a/src/main/java/com/sk89q/worldguard/util/RegionUtil.java +++ b/src/main/java/com/sk89q/worldguard/util/RegionUtil.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.util; diff --git a/src/main/java/org/enginehub/util/PermissionModel.java b/src/main/java/org/enginehub/util/PermissionModel.java deleted file mode 100644 index 2586f92d..00000000 --- a/src/main/java/org/enginehub/util/PermissionModel.java +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ -/* - * This file is a part of WorldGuard. - * Copyright (c) sk89q - * Copyright (c) the WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . -*/ - -package org.enginehub.util; - -public interface PermissionModel { - -} diff --git a/src/test/java/com/sk89q/worldguard/TestPlayer.java b/src/test/java/com/sk89q/worldguard/TestPlayer.java index 48d6a6a4..041796b9 100644 --- a/src/test/java/com/sk89q/worldguard/TestPlayer.java +++ b/src/test/java/com/sk89q/worldguard/TestPlayer.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard; diff --git a/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java b/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java index dac77261..c43b571d 100644 --- a/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; @@ -34,22 +34,22 @@ public void testStateFlagPriorityFallThrough() { MockApplicableRegionSet mock = new MockApplicableRegionSet(); ProtectedRegion region; - StateFlag STATE1 = new StateFlag(null, false); - StateFlag STATE2 = new StateFlag(null, false); - StateFlag STATE3 = new StateFlag(null, false); + StateFlag state1 = new StateFlag(null, false); + StateFlag state2 = new StateFlag(null, false); + StateFlag state3 = new StateFlag(null, false); region = mock.add(0); - region.setFlag(STATE1, StateFlag.State.ALLOW); - region.setFlag(STATE2, StateFlag.State.DENY); + region.setFlag(state1, StateFlag.State.ALLOW); + region.setFlag(state2, StateFlag.State.DENY); region = mock.add(1); - region.setFlag(STATE1, StateFlag.State.DENY); - region.setFlag(STATE3, StateFlag.State.ALLOW); + region.setFlag(state1, StateFlag.State.DENY); + region.setFlag(state3, StateFlag.State.ALLOW); ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.allows(STATE1)); - assertFalse(set.allows(STATE2)); - assertTrue(set.allows(STATE3)); + assertFalse(set.allows(state1)); + assertFalse(set.allows(state2)); + assertTrue(set.allows(state3)); } @Test @@ -57,24 +57,24 @@ public void testNonStateFlagPriorityFallThrough() { MockApplicableRegionSet mock = new MockApplicableRegionSet(); ProtectedRegion region; - StringFlag STRING1 = new StringFlag(null); - StringFlag STRING2 = new StringFlag(null); - StringFlag STRING3 = new StringFlag(null); - StringFlag STRING4 = new StringFlag(null); + StringFlag string1 = new StringFlag(null); + StringFlag string2 = new StringFlag(null); + StringFlag string3 = new StringFlag(null); + StringFlag string4 = new StringFlag(null); region = mock.add(0); - region.setFlag(STRING1, "Beans"); - region.setFlag(STRING2, "Apples"); + region.setFlag(string1, "Beans"); + region.setFlag(string2, "Apples"); region = mock.add(1); - region.setFlag(STRING1, "Cats"); - region.setFlag(STRING3, "Bananas"); + region.setFlag(string1, "Cats"); + region.setFlag(string3, "Bananas"); ApplicableRegionSet set = mock.getApplicableSet(); - assertEquals(set.getFlag(STRING1), "Cats"); - assertEquals(set.getFlag(STRING2), "Apples"); - assertEquals(set.getFlag(STRING3), "Bananas"); - assertEquals(set.getFlag(STRING4), null); + assertEquals(set.getFlag(string1), "Cats"); + assertEquals(set.getFlag(string2), "Apples"); + assertEquals(set.getFlag(string3), "Bananas"); + assertEquals(set.getFlag(string4), null); } @Test @@ -82,28 +82,28 @@ public void testStateFlagMultiplePriorityFallThrough() { MockApplicableRegionSet mock = new MockApplicableRegionSet(); ProtectedRegion region; - StringFlag STRING1 = new StringFlag(null); - StringFlag STRING2 = new StringFlag(null); - StringFlag STRING3 = new StringFlag(null); - StringFlag STRING4 = new StringFlag(null); + StringFlag string1 = new StringFlag(null); + StringFlag string2 = new StringFlag(null); + StringFlag string3 = new StringFlag(null); + StringFlag string4 = new StringFlag(null); region = mock.add(0); - region.setFlag(STRING1, "Beans"); - region.setFlag(STRING2, "Apples"); - region.setFlag(STRING3, "Dogs"); + region.setFlag(string1, "Beans"); + region.setFlag(string2, "Apples"); + region.setFlag(string3, "Dogs"); region = mock.add(1); - region.setFlag(STRING1, "Cats"); - region.setFlag(STRING3, "Bananas"); + region.setFlag(string1, "Cats"); + region.setFlag(string3, "Bananas"); region = mock.add(10); - region.setFlag(STRING3, "Strings"); + region.setFlag(string3, "Strings"); ApplicableRegionSet set = mock.getApplicableSet(); - assertEquals(set.getFlag(STRING1), "Cats"); - assertEquals(set.getFlag(STRING2), "Apples"); - assertEquals(set.getFlag(STRING3), "Strings"); - assertEquals(set.getFlag(STRING4), null); + assertEquals(set.getFlag(string1), "Cats"); + assertEquals(set.getFlag(string2), "Apples"); + assertEquals(set.getFlag(string3), "Strings"); + assertEquals(set.getFlag(string4), null); } @Test @@ -111,26 +111,26 @@ public void testStateGlobalDefault() { MockApplicableRegionSet mock = new MockApplicableRegionSet(); ProtectedRegion region; - StateFlag STATE1 = new StateFlag(null, false); - StateFlag STATE2 = new StateFlag(null, false); - StateFlag STATE3 = new StateFlag(null, false); - StateFlag STATE4 = new StateFlag(null, true); - StateFlag STATE5 = new StateFlag(null, true); - StateFlag STATE6 = new StateFlag(null, true); + StateFlag state1 = new StateFlag(null, false); + StateFlag state2 = new StateFlag(null, false); + StateFlag state3 = new StateFlag(null, false); + StateFlag state4 = new StateFlag(null, true); + StateFlag state5 = new StateFlag(null, true); + StateFlag state6 = new StateFlag(null, true); region = mock.global(); - region.setFlag(STATE1, StateFlag.State.ALLOW); - region.setFlag(STATE2, StateFlag.State.DENY); - region.setFlag(STATE4, StateFlag.State.ALLOW); - region.setFlag(STATE5, StateFlag.State.DENY); + region.setFlag(state1, StateFlag.State.ALLOW); + region.setFlag(state2, StateFlag.State.DENY); + region.setFlag(state4, StateFlag.State.ALLOW); + region.setFlag(state5, StateFlag.State.DENY); ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.allows(STATE1)); - assertFalse(set.allows(STATE2)); - assertFalse(set.allows(STATE3)); - assertTrue(set.allows(STATE4)); - assertFalse(set.allows(STATE5)); - assertTrue(set.allows(STATE6)); + assertTrue(set.allows(state1)); + assertFalse(set.allows(state2)); + assertFalse(set.allows(state3)); + assertTrue(set.allows(state4)); + assertFalse(set.allows(state5)); + assertTrue(set.allows(state6)); } @Test @@ -138,35 +138,35 @@ public void testStateGlobalWithRegionsDefault() { MockApplicableRegionSet mock = new MockApplicableRegionSet(); ProtectedRegion region; - StateFlag STATE1 = new StateFlag(null, false); - StateFlag STATE2 = new StateFlag(null, false); - StateFlag STATE3 = new StateFlag(null, false); - StateFlag STATE4 = new StateFlag(null, true); - StateFlag STATE5 = new StateFlag(null, true); - StateFlag STATE6 = new StateFlag(null, true); + StateFlag state1 = new StateFlag(null, false); + StateFlag state2 = new StateFlag(null, false); + StateFlag state3 = new StateFlag(null, false); + StateFlag state4 = new StateFlag(null, true); + StateFlag state5 = new StateFlag(null, true); + StateFlag state6 = new StateFlag(null, true); region = mock.global(); - region.setFlag(STATE1, StateFlag.State.ALLOW); - region.setFlag(STATE2, StateFlag.State.DENY); - region.setFlag(STATE4, StateFlag.State.ALLOW); - region.setFlag(STATE5, StateFlag.State.DENY); + region.setFlag(state1, StateFlag.State.ALLOW); + region.setFlag(state2, StateFlag.State.DENY); + region.setFlag(state4, StateFlag.State.ALLOW); + region.setFlag(state5, StateFlag.State.DENY); region = mock.add(0); - region.setFlag(STATE1, StateFlag.State.DENY); - region.setFlag(STATE2, StateFlag.State.DENY); - region.setFlag(STATE4, StateFlag.State.DENY); - region.setFlag(STATE5, StateFlag.State.DENY); + region.setFlag(state1, StateFlag.State.DENY); + region.setFlag(state2, StateFlag.State.DENY); + region.setFlag(state4, StateFlag.State.DENY); + region.setFlag(state5, StateFlag.State.DENY); region = mock.add(1); - region.setFlag(STATE5, StateFlag.State.ALLOW); + region.setFlag(state5, StateFlag.State.ALLOW); ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.allows(STATE1)); - assertFalse(set.allows(STATE2)); - assertFalse(set.allows(STATE3)); - assertFalse(set.allows(STATE4)); - assertTrue(set.allows(STATE5)); - assertTrue(set.allows(STATE6)); + assertFalse(set.allows(state1)); + assertFalse(set.allows(state2)); + assertFalse(set.allows(state3)); + assertFalse(set.allows(state4)); + assertTrue(set.allows(state5)); + assertTrue(set.allows(state6)); } @Test diff --git a/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java b/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java index b4261608..91336e57 100644 --- a/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java b/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java index 8500eab1..cd26c221 100644 --- a/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java b/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java index 2fd1941f..9536b43b 100644 --- a/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java b/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java index 8bbfe834..3417cf9a 100644 --- a/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java +++ b/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionEntryExitTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionEntryExitTest.java index 8cef24b3..e7e4061c 100644 --- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionEntryExitTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionEntryExitTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java index 4c35c7d7..e83ebb6f 100644 --- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java index 80c4c6fc..923ee3bd 100644 --- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java index 73202a5a..e5744c7d 100644 --- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java b/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java index f7617ac7..ba17582f 100644 --- a/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java @@ -1,30 +1,24 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2013 sk89q and contributors + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Before; -import org.junit.Test; - import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.Vector; import com.sk89q.worldguard.TestPlayer; @@ -36,6 +30,11 @@ import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public abstract class RegionEntryExitTest { static String ENTRY_ID = "entry_rg"; @@ -50,8 +49,8 @@ public abstract class RegionEntryExitTest { ProtectedRegion globalRegion; ProtectedRegion entryRegion; ProtectedRegion exitRegion; - TestPlayer vip_player; - TestPlayer builder_player; + TestPlayer vipPlayer; + TestPlayer builderPlayer; protected abstract RegionManager createRegionManager() throws Exception; @@ -67,14 +66,14 @@ public void setUp() throws Exception { } void setUpPlayers() { - vip_player = new TestPlayer("dudu"); - vip_player.addGroup(VIP_GROUP); + vipPlayer = new TestPlayer("dudu"); + vipPlayer.addGroup(VIP_GROUP); - builder_player = new TestPlayer("esskay"); - builder_player.addGroup(BUILDER_GROUP); + builderPlayer = new TestPlayer("esskay"); + builderPlayer.addGroup(BUILDER_GROUP); // @Test - // assertFalse(builderPlayer.wuvs(vip_player)); // causes test to fail + // assertFalse(builderPlayer.wuvs(vipPlayer)); // causes test to fail } void setUpGlobalRegion() { @@ -124,8 +123,8 @@ public void testEntry() throws Exception { // System.out.println("flag " + appl.getFlag(DefaultFlag.ENTRY)); // System.out.println("grp " + appl.getFlag(DefaultFlag.ENTRY.getRegionGroupFlag())); // System.out.println("==="); - assertTrue("Allowed Entry", appl.allows(DefaultFlag.ENTRY, vip_player)); - assertFalse("Forbidden Entry", appl.allows(DefaultFlag.ENTRY, builder_player)); + assertTrue("Allowed Entry", appl.allows(DefaultFlag.ENTRY, vipPlayer)); + assertFalse("Forbidden Entry", appl.allows(DefaultFlag.ENTRY, builderPlayer)); } @Test @@ -139,8 +138,8 @@ public void testExit() throws Exception { // System.out.println("flag " + appl.getFlag(DefaultFlag.EXIT)); // System.out.println("grp " + appl.getFlag(DefaultFlag.EXIT.getRegionGroupFlag())); // System.out.println("==="); - assertTrue("Allowed Exit", appl.allows(DefaultFlag.EXIT, builder_player)); - assertFalse("Forbidden Exit", appl.allows(DefaultFlag.EXIT, vip_player)); + assertTrue("Allowed Exit", appl.allows(DefaultFlag.EXIT, builderPlayer)); + assertFalse("Forbidden Exit", appl.allows(DefaultFlag.EXIT, vipPlayer)); } } diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java b/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java index 50d7dc22..362e4fe7 100644 --- a/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java b/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java index aed77b91..6b7be7bc 100644 --- a/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java @@ -1,21 +1,21 @@ -// $Id$ /* - * WorldGuard - * Copyright (C) 2010 sk89q + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . -*/ + */ package com.sk89q.worldguard.protection; diff --git a/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java b/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java index 5869bad4..fa37acbd 100644 --- a/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java +++ b/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java @@ -1,14 +1,35 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.sk89q.worldguard.protection.regions; import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector2D; import org.junit.Test; -import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class RegionIntersectTest { @Test @@ -36,31 +57,31 @@ public void testCuboidGetIntersectingRegions() { new BlockVector(0, 40, 5), new BlockVector(1000, 128, 8)), true); - List triangle_overlap = new ArrayList(); - triangle_overlap.add(new BlockVector2D(90, -10)); - triangle_overlap.add(new BlockVector2D(120, -10)); - triangle_overlap.add(new BlockVector2D(90, 20)); + List triangleOverlap = new ArrayList(); + triangleOverlap.add(new BlockVector2D(90, -10)); + triangleOverlap.add(new BlockVector2D(120, -10)); + triangleOverlap.add(new BlockVector2D(90, 20)); - assertIntersection(region, new ProtectedPolygonalRegion("triangle_overlap", - triangle_overlap, 0, 128), + assertIntersection(region, new ProtectedPolygonalRegion("triangleOverlap", + triangleOverlap, 0, 128), true); - List triangle_no_overlap = new ArrayList(); - triangle_no_overlap.add(new BlockVector2D(90, -10)); - triangle_no_overlap.add(new BlockVector2D(105, -10)); - triangle_no_overlap.add(new BlockVector2D(90, 5)); + List triangleNoOverlap = new ArrayList(); + triangleNoOverlap.add(new BlockVector2D(90, -10)); + triangleNoOverlap.add(new BlockVector2D(105, -10)); + triangleNoOverlap.add(new BlockVector2D(90, 5)); - assertIntersection(region, new ProtectedPolygonalRegion("triangle_no_overlap", - triangle_no_overlap, 0, 128), + assertIntersection(region, new ProtectedPolygonalRegion("triangleNoOverlap", + triangleNoOverlap, 0, 128), false); - List triangle_overlap_no_points = new ArrayList(); - triangle_overlap_no_points.add(new BlockVector2D(100, -10)); - triangle_overlap_no_points.add(new BlockVector2D(120, 50)); - triangle_overlap_no_points.add(new BlockVector2D(140, -20)); + List triangleOverlapNoPoints = new ArrayList(); + triangleOverlapNoPoints.add(new BlockVector2D(100, -10)); + triangleOverlapNoPoints.add(new BlockVector2D(120, 50)); + triangleOverlapNoPoints.add(new BlockVector2D(140, -20)); - assertIntersection(region, new ProtectedPolygonalRegion("triangle_overlap_no_points", - triangle_overlap_no_points, 60, 80), + assertIntersection(region, new ProtectedPolygonalRegion("triangleOverlapNoPoints", + triangleOverlapNoPoints, 60, 80), true); }