Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2025-02-25 15:11:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed blockstates resetting when normal blocks were regenerated using custom mining

Browse Source
This commit is contained in:
ASangarin 2020-12-27 22:19:57 +01:00
parent 0662f460f2
commit 240fad3f34
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/Indyuce/mmocore/api/block/BlockType.java
View File

@ -7,6 +7,7 @@ import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock;
public interface BlockType { public interface BlockType {
void place(Location loc, RegeneratingBlock regenerating); void place(Location loc, RegeneratingBlock regenerating);
void regen(Location loc, RegeneratingBlock regenerating);
/** /**
* Generates a key used to store the BlockInfo instance in the manager map, * Generates a key used to store the BlockInfo instance in the manager map,

14
src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java
View File

@ -1,13 +1,12 @@
package net.Indyuce.mmocore.api.block; package net.Indyuce.mmocore.api.block;
import org.bukkit.Location;
import org.bukkit.block.Block;
import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock; import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.MMOLineConfig; import net.mmogroup.mmolib.api.MMOLineConfig;
import net.mmogroup.mmolib.version.VersionMaterial; import net.mmogroup.mmolib.version.VersionMaterial;
import org.bukkit.Location;
import org.bukkit.block.Block;
public class SkullBlockType implements BlockType { public class SkullBlockType implements BlockType {
private final String value; private final String value;
@ -37,6 +36,15 @@ public class SkullBlockType implements BlockType {
MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value);
} }
@Override
public void regen(Location loc, RegeneratingBlock block) {
// This makes sure that if a skull loses it's original rotation
// it can revert back to it when the base block is regenerated
loc.getBlock().setBlockData(block.getBlockData());
MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value);
}
@Override @Override
public String generateKey() { public String generateKey() {
return "vanilla-skull-" + value; return "vanilla-skull-" + value;

7
src/main/java/net/Indyuce/mmocore/api/block/VanillaBlockType.java
View File

@ -1,5 +1,6 @@
package net.Indyuce.mmocore.api.block; package net.Indyuce.mmocore.api.block;
import net.mmogroup.mmolib.MMOLib;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -48,6 +49,12 @@ public class VanillaBlockType implements BlockType {
} }
} }
@Override
public void regen(Location loc, RegeneratingBlock block) {
// Sets the original blocks old data (only when regenerating)
loc.getBlock().setBlockData(block.getBlockData());
}
@Override @Override
public String generateKey() { public String generateKey() {
return "vanilla-block-" + type.name(); return "vanilla-block-" + type.name();

1
src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java
View File

@ -124,6 +124,7 @@ public class CustomBlockManager extends MMOManager {
// Get the chunk and load it async if needed. // Get the chunk and load it async if needed.
PaperLib.getChunkAtAsync(infoLocation).whenComplete((chunk, ex) -> { PaperLib.getChunkAtAsync(infoLocation).whenComplete((chunk, ex) -> {
info.getRegeneratingBlock().getBlock().place(infoLocation, info); info.getRegeneratingBlock().getBlock().place(infoLocation, info);
info.getRegeneratingBlock().getBlock().regen(infoLocation, info);
info.getLocation().getBlock().getState().update(); info.getLocation().getBlock().getState().update();
if (!shutdown) if (!shutdown)
active.remove(info); active.remove(info);