Updated WNA package with upstream

This commit is contained in:
MattBDev 2020-08-14 20:25:21 -04:00
parent 0a07599abf
commit 69e547688b
2 changed files with 26 additions and 19 deletions

View File

@ -3,18 +3,18 @@
* Copyright (C) sk89q <http://www.sk89q.com> * Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors * Copyright (C) WorldEdit team and contributors
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify
* under the terms of the GNU Lesser General Public License as published by the * it under the terms of the GNU General Public License as published by
* Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful,
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * but WITHOUT ANY WARRANTY; without even the implied warranty of
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.sk89q.worldedit.internal.wna; package com.sk89q.worldedit.internal.wna;
@ -110,7 +110,9 @@ public interface WorldNativeAccess<NC, NBS, NP> {
/** /**
* Receive the current side-effect set from the high level call. * Receive the current side-effect set from the high level call.
* *
* <p>
* This allows the implementation to branch on the side-effects internally. * This allows the implementation to branch on the side-effects internally.
* </p>
* *
* @param sideEffectSet the set of side-effects * @param sideEffectSet the set of side-effects
*/ */
@ -149,9 +151,11 @@ public interface WorldNativeAccess<NC, NBS, NP> {
void onBlockStateChange(NP pos, NBS oldState, NBS newState); void onBlockStateChange(NP pos, NBS oldState, NBS newState);
/** /**
* This is a heavily modified function stripped from MC to apply worldedit-modifications. * This is a heavily modified function stripped from MC to apply WorldEdit-modifications.
* *
* <p>
* See Forge's World.markAndNotifyBlock * See Forge's World.markAndNotifyBlock
* </p>
*/ */
default void markAndNotifyBlock(NP pos, NC chunk, NBS oldState, NBS newState, SideEffectSet sideEffectSet) { default void markAndNotifyBlock(NP pos, NC chunk, NBS oldState, NBS newState, SideEffectSet sideEffectSet) {
NBS blockState1 = getBlockState(chunk, pos); NBS blockState1 = getBlockState(chunk, pos);
@ -178,6 +182,7 @@ public interface WorldNativeAccess<NC, NBS, NP> {
updateNeighbors(pos, oldState, newState, 512); updateNeighbors(pos, oldState, newState, 512);
} }
// Seems used only for PoI updates
onBlockStateChange(pos, oldState, newState); onBlockStateChange(pos, oldState, newState);
} }

View File

@ -3,23 +3,25 @@
* Copyright (C) sk89q <http://www.sk89q.com> * Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors * Copyright (C) WorldEdit team and contributors
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify
* under the terms of the GNU Lesser General Public License as published by the * it under the terms of the GNU General Public License as published by
* Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful,
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * but WITHOUT ANY WARRANTY; without even the implied warranty of
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
/** /**
* "WNA", or WorldEdit Native Access. * "WNA", or WorldEdit Native Access.
* *
* <p>
* Contains internal helper functions for sharing code between platforms. * Contains internal helper functions for sharing code between platforms.
* </p>
*/ */
package com.sk89q.worldedit.internal.wna; package com.sk89q.worldedit.internal.wna;