From 0d347a3837b20b47f46cf8c1051a0a63cc33708c Mon Sep 17 00:00:00 2001 From: flamin_scotsman Date: Tue, 10 Mar 2015 21:51:35 +0000 Subject: [PATCH] Fix incorrect instantiation of BlockBag and EditSession in two of the tools. Used EditSessionFactory rather than getting the EditSession from the local session. --- .../com/sk89q/worldedit/command/tool/BlockReplacer.java | 7 +++---- .../java/com/sk89q/worldedit/command/tool/QueryTool.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java index d1af045bb..8d4f718c4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java @@ -46,10 +46,9 @@ public class BlockReplacer implements DoubleActionBlockTool { @Override public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) { -BlockBag bag = session.getBlockBag(player); + BlockBag bag = session.getBlockBag(player); - World world = (World) clicked.getExtent(); - EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, bag, player); + EditSession editSession = session.createEditSession(player); try { editSession.setBlock(clicked.toVector(), targetBlock); @@ -68,7 +67,7 @@ BlockBag bag = session.getBlockBag(player); @Override public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) { World world = (World) clicked.getExtent(); - EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, player); + EditSession editSession = session.createEditSession(player); targetBlock = (editSession).getBlock(clicked.toVector()); BlockType type = BlockType.fromID(targetBlock.getType()); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java index 6aa5262a0..aa039de9c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java @@ -43,7 +43,7 @@ public class QueryTool implements BlockTool { public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) { World world = (World) clicked.getExtent(); - EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, 0, player); + EditSession editSession = session.createEditSession(player); BaseBlock block = (editSession).rawGetBlock(clicked.toVector()); BlockType type = BlockType.fromID(block.getType());