ChromaGaming/LimitedCreative
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity

Fix WorldEdit integration stopping edits

Browse source 
It's been only more than a year, it's fine
This commit is contained in:
Norbi Peti 2021-02-21 00:04:56 +01:00
parent e4548069dc
commit dcd3ff31db
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
4 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/de/jaschastarke/minecraft/limitedcreative/Hooks.java
View file

@ -1,13 +1,12 @@
package de.jaschastarke.minecraft.limitedcreative; package de.jaschastarke.minecraft.limitedcreative;
import org.bukkit.Bukkit;
import de.jaschastarke.hooking.BooleanHooker; import de.jaschastarke.hooking.BooleanHooker;
import de.jaschastarke.hooking.GetHooker; import de.jaschastarke.hooking.GetHooker;
import de.jaschastarke.minecraft.limitedcreative.hooks.MultiVerseHooks; import de.jaschastarke.minecraft.limitedcreative.hooks.MultiVerseHooks;
import de.jaschastarke.minecraft.limitedcreative.hooks.PlayerCheckHooker; import de.jaschastarke.minecraft.limitedcreative.hooks.PlayerCheckHooker;
import de.jaschastarke.minecraft.limitedcreative.hooks.WorldTypeHooker; import de.jaschastarke.minecraft.limitedcreative.hooks.WorldTypeHooker;
import de.jaschastarke.minecraft.limitedcreative.hooks.xAuthHooks; import de.jaschastarke.minecraft.limitedcreative.hooks.xAuthHooks;
import org.bukkit.Bukkit;
public final class Hooks { public final class Hooks {
public static PlayerCheckHooker IsLoggedIn = new PlayerCheckHooker(true); public static PlayerCheckHooker IsLoggedIn = new PlayerCheckHooker(true);
@ -53,7 +52,8 @@ public final class Hooks {
public static boolean isAuthMePresent() { public static boolean isAuthMePresent() {
if (isPluginEnabled("AuthMe")) { if (isPluginEnabled("AuthMe")) {
try { try {
return Class.forName("uk.org.whoami.authme.api.API") != null; Class.forName("uk.org.whoami.authme.api.API");
return true;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
return false; return false;
} }
@ -64,7 +64,8 @@ public final class Hooks {
public static boolean isXAuth20Present() { public static boolean isXAuth20Present() {
if (isPluginEnabled("xAuth")) { if (isPluginEnabled("xAuth")) {
try { try {
return Class.forName("com.cypherx.xauth.xAuth") != null; Class.forName("com.cypherx.xauth.xAuth");
return true;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
return false; return false;
} }

1
src/main/java/de/jaschastarke/minecraft/limitedcreative/ModInventories.java
View file

@ -28,7 +28,6 @@ public class ModInventories extends CoreModule<LimitedCreative> {
return "Inventory"; return "Inventory";
} }
@SuppressWarnings("deprecation")
@Override @Override
public void initialize(ModuleEntry<IModule> entry) { public void initialize(ModuleEntry<IModule> entry) {
super.initialize(entry); super.initialize(entry);

5
src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/BlockStateCommand.java
View file

@ -167,9 +167,7 @@ public class BlockStateCommand extends BukkitCommand implements IHelpDescribed {
final BlockVector3 min = selection.getMinimumPoint(); final BlockVector3 min = selection.getMinimumPoint();
final BlockVector3 max = selection.getMaximumPoint(); final BlockVector3 max = selection.getMaximumPoint();
mod.getPlugin().getServer().getScheduler().runTaskAsynchronously(mod.getPlugin(), new Runnable() { mod.getPlugin().getServer().getScheduler().runTaskAsynchronously(mod.getPlugin(), () -> {
@Override
public void run() {
if (mod.isDebug()) if (mod.isDebug())
mod.getLog().debug("Scheduler: Asynchronous Task run"); mod.getLog().debug("Scheduler: Asynchronous Task run");
DBTransaction update = mod.getModel().groupUpdate(); DBTransaction update = mod.getModel().groupUpdate();
@ -203,7 +201,6 @@ public class BlockStateCommand extends BukkitCommand implements IHelpDescribed {
update.finish(); update.finish();
context.response(L("command.blockstate.command_updated", count)); context.response(L("command.blockstate.command_updated", count));
}
}); });
return true; return true;
} }

1
src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/worldedit/EditSessionExtent.java
View file

@ -54,6 +54,7 @@ public class EditSessionExtent extends AbstractDelegateExtent {
mod.getModel().setState(s); mod.getModel().setState(s);
} }
super.setBlock(pt, newBlock);
return true; return true;
} }
} }