From 69e547688bfff0fa9cd2996a24ec8d5f34f59a11 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Fri, 14 Aug 2020 20:25:21 -0400 Subject: [PATCH] Updated WNA package with upstream --- .../internal/wna/WorldNativeAccess.java | 25 +++++++++++-------- .../worldedit/internal/wna/package-info.java | 20 ++++++++------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WorldNativeAccess.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WorldNativeAccess.java index ac32171e7..d005e00e2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WorldNativeAccess.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WorldNativeAccess.java @@ -3,18 +3,18 @@ * Copyright (C) sk89q * 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 + * 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 * (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 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 General Public License + * along with this program. If not, see . */ package com.sk89q.worldedit.internal.wna; @@ -110,7 +110,9 @@ public interface WorldNativeAccess { /** * Receive the current side-effect set from the high level call. * + *

* This allows the implementation to branch on the side-effects internally. + *

* * @param sideEffectSet the set of side-effects */ @@ -149,9 +151,11 @@ public interface WorldNativeAccess { 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. * + *

* See Forge's World.markAndNotifyBlock + *

*/ default void markAndNotifyBlock(NP pos, NC chunk, NBS oldState, NBS newState, SideEffectSet sideEffectSet) { NBS blockState1 = getBlockState(chunk, pos); @@ -178,6 +182,7 @@ public interface WorldNativeAccess { updateNeighbors(pos, oldState, newState, 512); } + // Seems used only for PoI updates onBlockStateChange(pos, oldState, newState); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/package-info.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/package-info.java index 69009eb59..182a40448 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/package-info.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/package-info.java @@ -3,23 +3,25 @@ * Copyright (C) sk89q * 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 + * 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 * (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 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 General Public License + * along with this program. If not, see . */ /** * "WNA", or WorldEdit Native Access. * + *

* Contains internal helper functions for sharing code between platforms. + *

*/ package com.sk89q.worldedit.internal.wna;