Add license notice back and remove left over git stuff.

This commit is contained in:
MattBDev 2019-06-23 14:07:47 -04:00
parent 57f992a524
commit c672bcfddd

View File

@ -1,7 +1,23 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit 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 <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
@ -49,12 +65,11 @@ public final class Masks {
/** /**
* Negate the given mask. * Negate the given mask.
* *
* @param finalMask the mask * @param mask the mask
* @return a new mask * @return a new mask
*/ */
//<<<<<<< HEAD public static Mask negate(final Mask mask) {
public static Mask negate(final Mask finalMask) { return mask.inverse();
return finalMask.inverse();
} }
/** /**
@ -156,5 +171,4 @@ public final class Masks {
} }
} }
} }