Works with WorldEdit 6 or 7

Author: hexosse

pom.xml

@@ -23,7 +23,7 @@
     <groupId>com.github.hexocraft</groupId>
     <artifactId>addlight</artifactId>
     <name>AddLight</name>
-    <version>4.3.0</version>
+    <version>4.3.1</version>
     <packaging>jar</packaging>
     <description>This plugin allow server admin to add invisible light sources.</description>
     <url>https://github.com/hexocraft/AddLight</url>

src/main/java/com/github/hexocraft/addlight/LightsApi.java

@@ -23,7 +23,6 @@
 import com.google.common.collect.Lists;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -124,8 +123,8 @@ public void run()
 						Vector vCorner1 = worldEdit.getSelection(player).getMaximumPoint();
 						Vector vCorner2 = worldEdit.getSelection(player).getMinimumPoint();
 
-						corner1 = BukkitAdapter.adapt(player.getWorld(), vCorner1);
-						corner2 = BukkitAdapter.adapt(player.getWorld(), vCorner2);
+						corner1 = new org.bukkit.Location(player.getWorld(), vCorner1.getX(), vCorner1.getY(), vCorner1.getZ());
+						corner2 = new org.bukkit.Location(player.getWorld(), vCorner2.getX(), vCorner2.getY(), vCorner2.getZ());
 					}
 
 					List<Location> locations = ConnectedBlocks.getConnectedBlocks(location, config.cbLimit, corner1, corner2);
@@ -199,8 +198,8 @@ public void run()
 						Vector vCorner1 = worldEdit.getSelection(player).getMaximumPoint();
 						Vector vCorner2 = worldEdit.getSelection(player).getMinimumPoint();
 
-						corner1 = BukkitAdapter.adapt(player.getWorld(), vCorner1);
-						corner2 = BukkitAdapter.adapt(player.getWorld(), vCorner2);
+						corner1 = new org.bukkit.Location(player.getWorld(), vCorner1.getX(), vCorner1.getY(), vCorner1.getZ());
+						corner2 = new org.bukkit.Location(player.getWorld(), vCorner2.getX(), vCorner2.getY(), vCorner2.getZ());
 					}
 
 					List<Location> locations = ConnectedBlocks.getConnectedBlocks(location, config.cbLimit, corner1, corner2);

src/main/java/com/github/hexocraft/addlight/integrations/WorldEditHooker.java

@@ -20,14 +20,15 @@
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.CylinderRegion;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.world.World;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
@@ -58,11 +59,11 @@ public Region getRegion(Player player) {
         if(player == null) throw new IllegalArgumentException("Null player not allowed");
         if(!player.isOnline()) throw new IllegalArgumentException("Offline player not allowed");
 
-        BukkitPlayer worldEditPlayer = plugin.wrapPlayer(player);
-        LocalSession session = WorldEdit.getInstance().getSessionManager().get(worldEditPlayer);
-        RegionSelector selector = session.getRegionSelector(worldEditPlayer.getWorld());
-
         try {
+            BukkitPlayer wPlayer = plugin.wrapPlayer(player);
+            LocalSession session = WorldEdit.getInstance().getSessionManager().get(wPlayer);
+            RegionSelector selector = session.getRegionSelector((World) wPlayer.getWorld());
+
             return selector.getRegion();
         } catch(IncompleteRegionException e) {
             return null;
@@ -74,11 +75,9 @@ public Region getSelection(Player player) {
         if(!player.isOnline()) throw new IllegalArgumentException("Offline player not allowed");
 
         try {
-            BukkitPlayer worldEditPlayer = plugin.wrapPlayer(player);
-            LocalSession session = WorldEdit.getInstance().getSessionManager().get(worldEditPlayer);
-            Region region = session.getSelection(worldEditPlayer.getWorld());
-
-            return region;
+            BukkitPlayer wPlayer = plugin.wrapPlayer(player);
+            LocalSession session = WorldEdit.getInstance().getSessionManager().get(wPlayer);
+            return session.getSelection((World) wPlayer.getWorld());
         } catch(IncompleteRegionException e) {
             return null;
         }
@@ -95,11 +94,11 @@ public boolean isLocationInSelection(Player player, Location location) {
         if(!player.isOnline()) throw new IllegalArgumentException("Offline player not allowed");
 
         try {
-            BukkitPlayer worldEditPlayer = plugin.wrapPlayer(player);
-            LocalSession session = WorldEdit.getInstance().getSessionManager().get(worldEditPlayer);
-            Region region = session.getSelection(worldEditPlayer.getWorld());
-
-            return region != null && region.contains(BukkitAdapter.asVector(location));
+            BukkitPlayer wPlayer = plugin.wrapPlayer(player);
+            LocalSession session = WorldEdit.getInstance().getSessionManager().get(wPlayer);
+            Region region = session.getSelection((World) wPlayer.getWorld());
+            Vector vLocation = new Vector(location.getX(), location.getY(), location.getZ());
+            return region != null && region.contains(vLocation);
         } catch(IncompleteRegionException e) {
             return false;
         }