Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-05 10:31:16 +10:00
parent 5eff53f1f8
commit bde226e7cd
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/boydti/fawe/Fawe.java
View File

@ -261,6 +261,9 @@ public class Fawe {
private WorldEdit worldedit; private WorldEdit worldedit;
public WorldEdit getWorldEdit() { public WorldEdit getWorldEdit() {
if (this.worldedit == null) {
return worldedit = WorldEdit.getInstance();
}
return this.worldedit; return this.worldedit;
} }

2
core/src/main/java/com/boydti/fawe/object/FawePlayer.java
View File

@ -302,7 +302,7 @@ public abstract class FawePlayer<T> {
* @return * @return
*/ */
public LocalSession getSession() { public LocalSession getSession() {
return (this.session != null || this.getPlayer() == null) ? this.session : (session = Fawe.get().getWorldEdit().getSession(this.getPlayer())); return (this.session != null || this.getPlayer() == null || Fawe.get() == null) ? this.session : (session = Fawe.get().getWorldEdit().getSession(this.getPlayer()));
} }
/** /**

10
core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
View File

@ -21,6 +21,9 @@ package com.sk89q.worldedit.command;
import com.boydti.fawe.Fawe; import com.boydti.fawe.Fawe;
import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.BBC;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.database.DBHandler;
import com.boydti.fawe.database.RollbackDatabase;
import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.MainUtil;
import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandContext;
@ -64,6 +67,10 @@ public class HistoryCommands {
) )
@CommandPermissions("worldedit.history.undo") @CommandPermissions("worldedit.history.undo")
public void faweRollback(Player player, LocalSession session, String user, int radius, String time) throws WorldEditException { public void faweRollback(Player player, LocalSession session, String user, int radius, String time) throws WorldEditException {
if (!Settings.HISTORY.USE_DATABASE) {
BBC.SETTING_DISABLE.send(player, "history.use-database");
return;
}
UUID other = Fawe.imp().getUUID(user); UUID other = Fawe.imp().getUUID(user);
if (other == null) { if (other == null) {
BBC.PLAYER_NOT_FOUND.send(player, user); BBC.PLAYER_NOT_FOUND.send(player, user);
@ -79,6 +86,9 @@ public class HistoryCommands {
WorldVector origin = player.getPosition(); WorldVector origin = player.getPosition();
Vector bot = origin.subtract(radius, radius, radius); Vector bot = origin.subtract(radius, radius, radius);
Vector top = origin.add(radius, radius, radius); Vector top = origin.add(radius, radius, radius);
RollbackDatabase database = DBHandler.IMP.getDatabase(Fawe.imp().getWorldName(world));
// TODO // TODO
} }