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

Fix snipe event locking thread when used synchronously

Browse Source
This commit is contained in:
Jesse Boyd 2018-05-15 15:36:59 +10:00
parent 7aebc60983
commit fb744cdb21
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java
View File

@ -54,6 +54,8 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import com.thevoxelbox.voxelsniper.brush.perform.Performer; import com.thevoxelbox.voxelsniper.brush.perform.Performer;
import com.thevoxelbox.voxelsniper.event.SniperMaterialChangedEvent; import com.thevoxelbox.voxelsniper.event.SniperMaterialChangedEvent;
import com.thevoxelbox.voxelsniper.event.SniperReplaceMaterialChangedEvent; import com.thevoxelbox.voxelsniper.event.SniperReplaceMaterialChangedEvent;
import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -64,8 +66,10 @@ import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.material.MaterialData; import org.bukkit.material.MaterialData;
import org.bukkit.plugin.PluginManager;
public class Sniper { public class Sniper {
private VoxelSniper plugin; private VoxelSniper plugin;
@ -256,14 +260,14 @@ public class Sniper {
int originalVoxel = snipeData.getVoxelId(); int originalVoxel = snipeData.getVoxelId();
snipeData.setVoxelId(targetBlock.getTypeId()); snipeData.setVoxelId(targetBlock.getTypeId());
SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(originalVoxel, snipeData.getData()), new MaterialData(snipeData.getVoxelId(), snipeData.getData())); SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(originalVoxel, snipeData.getData()), new MaterialData(snipeData.getVoxelId(), snipeData.getData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().voxel(); snipeData.getVoxelMessage().voxel();
return true; return true;
} else { } else {
int originalVoxel = snipeData.getVoxelId(); int originalVoxel = snipeData.getVoxelId();
snipeData.setVoxelId(0); snipeData.setVoxelId(0);
SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(originalVoxel, snipeData.getData()), new MaterialData(snipeData.getVoxelId(), snipeData.getData())); SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(originalVoxel, snipeData.getData()), new MaterialData(snipeData.getVoxelId(), snipeData.getData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().voxel(); snipeData.getVoxelMessage().voxel();
return true; return true;
} }
@ -272,14 +276,14 @@ public class Sniper {
byte originalData = snipeData.getData(); byte originalData = snipeData.getData();
snipeData.setData(targetBlock.getData()); snipeData.setData(targetBlock.getData());
SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getVoxelId(), originalData), new MaterialData(snipeData.getVoxelId(), snipeData.getData())); SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getVoxelId(), originalData), new MaterialData(snipeData.getVoxelId(), snipeData.getData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().data(); snipeData.getVoxelMessage().data();
return true; return true;
} else { } else {
byte originalData = snipeData.getData(); byte originalData = snipeData.getData();
snipeData.setData((byte) 0); snipeData.setData((byte) 0);
SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getVoxelId(), originalData), new MaterialData(snipeData.getVoxelId(), snipeData.getData())); SniperMaterialChangedEvent event = new SniperMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getVoxelId(), originalData), new MaterialData(snipeData.getVoxelId(), snipeData.getData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().data(); snipeData.getVoxelMessage().data();
return true; return true;
} }
@ -302,14 +306,14 @@ public class Sniper {
int originalId = snipeData.getReplaceId(); int originalId = snipeData.getReplaceId();
snipeData.setReplaceId(targetBlock.getTypeId()); snipeData.setReplaceId(targetBlock.getTypeId());
SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(originalId, snipeData.getReplaceData()), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData())); SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(originalId, snipeData.getReplaceData()), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().replace(); snipeData.getVoxelMessage().replace();
return true; return true;
} else { } else {
int originalId = snipeData.getReplaceId(); int originalId = snipeData.getReplaceId();
snipeData.setReplaceId(0); snipeData.setReplaceId(0);
SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(originalId, snipeData.getReplaceData()), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData())); SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(originalId, snipeData.getReplaceData()), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().replace(); snipeData.getVoxelMessage().replace();
return true; return true;
} }
@ -318,14 +322,14 @@ public class Sniper {
byte originalData = snipeData.getReplaceData(); byte originalData = snipeData.getReplaceData();
snipeData.setReplaceData(targetBlock.getData()); snipeData.setReplaceData(targetBlock.getData());
SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getReplaceId(), originalData), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData())); SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getReplaceId(), originalData), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().replaceData(); snipeData.getVoxelMessage().replaceData();
return true; return true;
} else { } else {
byte originalData = snipeData.getReplaceData(); byte originalData = snipeData.getReplaceData();
snipeData.setReplaceData((byte) 0); snipeData.setReplaceData((byte) 0);
SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getReplaceId(), originalData), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData())); SniperReplaceMaterialChangedEvent event = new SniperReplaceMaterialChangedEvent(this, toolId, new MaterialData(snipeData.getReplaceId(), originalData), new MaterialData(snipeData.getReplaceId(), snipeData.getReplaceData()));
Bukkit.getPluginManager().callEvent(event); callEvent(event);
snipeData.getVoxelMessage().replaceData(); snipeData.getVoxelMessage().replaceData();
return true; return true;
} }
@ -412,6 +416,24 @@ public class Sniper {
return false; return false;
} }
private void callEvent(Event event) {
if (Fawe.isMainThread()) {
Bukkit.getPluginManager().callEvent(event);
} else {
if (event.isAsynchronous()) {
Bukkit.getPluginManager().callEvent(event);
} else {
try {
PluginManager plm = Bukkit.getPluginManager();
Class<? extends PluginManager> clazz = plm.getClass();
Method methodFireEvent = clazz.getDeclaredMethod("fireEvent", Event.class);
methodFireEvent.setAccessible(true);
methodFireEvent.invoke(plm, event);
} catch (Throwable ignore) {}
}
}
}
public IBrush setBrush(String toolId, Class<? extends IBrush> brush) { public IBrush setBrush(String toolId, Class<? extends IBrush> brush) {
if (!tools.containsKey(toolId)) { if (!tools.containsKey(toolId)) {
return null; return null;