Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing

Browse Source
This commit is contained in:
IronApollo 2019-02-27 08:09:04 -05:00
parent 24fbc86cdd
commit 3ffb5ff00d
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -189,7 +189,6 @@ public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
} }
} }
} }
System.out.println("finished enable");
} }
private void rename() { private void rename() {

8
worldedit-core/src/main/java/com/boydti/fawe/Fawe.java
View File

@ -213,10 +213,10 @@ public class Fawe {
try { try {
transformParser = new DefaultTransformParser(getWorldEdit()); transformParser = new DefaultTransformParser(getWorldEdit());
visualQueue = new VisualQueue(3); visualQueue = new VisualQueue(3);
// WEManager.IMP.managers.addAll(Fawe.this.IMP.getMaskManagers()); WEManager.IMP.managers.addAll(Fawe.this.IMP.getMaskManagers());
// WEManager.IMP.managers.add(new PlotSquaredFeature()); WEManager.IMP.managers.add(new PlotSquaredFeature());
// Fawe.debug("Plugin 'PlotSquared' found. Using it now."); Fawe.debug("Plugin 'PlotSquared' found. Using it now.");
} catch (Throwable e) {e.printStackTrace();} } catch (Throwable e) {}
}, 0); }, 0);
TaskManager.IMP.repeat(timer, 1); TaskManager.IMP.repeat(timer, 1);

2
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSquaredFeature.java
View File

@ -33,7 +33,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
public PlotSquaredFeature() { public PlotSquaredFeature() {
super("PlotSquared"); super("PlotSquared");
Fawe.debug("Optimizing PlotSquared"); Fawe.debug("Optimizing PlotSquared");
PlotSquared.get().worldedit = null; // PlotSquared.get().worldedit = null;
setupBlockQueue(); setupBlockQueue();
setupSchematicHandler(); setupSchematicHandler();
setupChunkManager(); setupChunkManager();

7
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -542,10 +542,9 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
return new NullExtent(extent, BBC.WORLDEDIT_CANCEL_REASON_MANUAL); return new NullExtent(extent, BBC.WORLDEDIT_CANCEL_REASON_MANUAL);
} }
final Extent toReturn = event.getExtent(); final Extent toReturn = event.getExtent();
// if(toReturn instanceof com.sk89q.worldedit.extent.NullExtent) { if(toReturn instanceof com.sk89q.worldedit.extent.NullExtent) {
// return new NullExtent(toReturn, null); return new NullExtent(toReturn, null);
// return new AbstractDelegateExtent(toReturn); }
// });
if (!(toReturn instanceof AbstractDelegateExtent)) { if (!(toReturn instanceof AbstractDelegateExtent)) {
Fawe.debug("Extent " + toReturn + " must be AbstractDelegateExtent"); Fawe.debug("Extent " + toReturn + " must be AbstractDelegateExtent");
return extent; return extent;

3
worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
View File

@ -335,8 +335,7 @@ public class RegionCommands extends MethodCommands {
@Logging(REGION) @Logging(REGION)
public void set(FawePlayer player, LocalSession session, EditSession editSession, @Selection Region selection, Pattern to, CommandContext context) throws WorldEditException { public void set(FawePlayer player, LocalSession session, EditSession editSession, @Selection Region selection, Pattern to, CommandContext context) throws WorldEditException {
player.checkConfirmationRegion(() -> { player.checkConfirmationRegion(() -> {
int affected; int affected = editSession.setBlocks(selection, to);
affected = editSession.setBlocks(selection, to);
if (affected != 0) { if (affected != 0) {
BBC.OPERATION.send(player, affected); BBC.OPERATION.send(player, affected);
if (!player.hasPermission("fawe.tips")) if (!player.hasPermission("fawe.tips"))

4
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/DefaultMaskParser.java
View File

@ -213,12 +213,12 @@ public class DefaultMaskParser extends FaweParser<Mask> {
throw new InputParseException(e2.getMessage()); throw new InputParseException(e2.getMessage());
} }
}); });
}
} }
if (pe.and) { if (pe.and) {
masks.add(new ArrayList<>()); masks.add(new ArrayList<>());
} }
masks.get(masks.size() - 1).add(mask); masks.get(masks.size() - 1).add(mask);
}
} }
} catch (InputParseException rethrow) { } catch (InputParseException rethrow) {
throw rethrow; throw rethrow;
@ -240,7 +240,7 @@ public class DefaultMaskParser extends FaweParser<Mask> {
return new MaskIntersection(maskUnions); return new MaskIntersection(maskUnions);
} else { } else {
return null; return null;
} }
} }
} }