Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix persistent brushes

Browse Source
This commit is contained in:
Jesse Boyd
2018-08-24 07:18:14 +10:00
parent dbd31ea347
commit c3db5c0cf1
10 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java
View File

@ -38,7 +38,9 @@ public final class BrushCache {
BrushTool cached = brushCache.get(key);
if (cached != null) return cached;
StringTag json = (StringTag) item.getNbtData().getValue().get("weBrushJson");
CompoundTag nbt = item.getNbtData();
if (nbt == null) return null;
StringTag json = (StringTag) nbt.getValue().get("weBrushJson");
if (json != null) {
try {
if (RECURSION.get() != null) return null;

4
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -957,7 +957,7 @@ public class LocalSession implements TextureHolder {
}
public Tool getTool(BaseItem item, Player player) {
if (item.getNativeItem() != null && Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES) {
if (Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES && item.getNativeItem() != null) {
BrushTool tool = BrushCache.getTool(player, this, item);
if (tool != null) return tool;
}
@ -1034,7 +1034,7 @@ public class LocalSession implements TextureHolder {
throw new InvalidToolBindException(type, "Already used for the navigation wand");
}
Tool previous;
if (player != null && (tool instanceof BrushTool || tool == null) && item.getNativeItem() != null && Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES) {
if (player != null && (tool instanceof BrushTool || tool == null) && Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES && item.getNativeItem() != null) {
previous = BrushCache.getCachedTool(item);
if (tool != null) {
BrushCache.setTool(item, (BrushTool) tool);

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
View File

@ -168,8 +168,8 @@ public class SchematicCommands extends MethodCommands {
@Command(
aliases = {"remap"},
help = "Remap a clipboard between MCPE/PC values\n",
desc = "Remap a clipboard between MCPE/PC values\n"
help = "Remap a clipboard between MCPE/PC values",
desc = "Remap a clipboard between MCPE/PC values"
)
@Deprecated
@CommandPermissions({"worldedit.schematic.remap"})

2
worldedit-core/src/main/resources/fawe.properties
View File

@ -1 +1 @@
version=${version}
version=${internalVersion}