Merge pull request #105 from BentoBoxWorld/develop

2.8.1

Author: tastybento

pom.xml

@@ -54,15 +54,15 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.21.4-R0.1-SNAPSHOT</spigot.version>
         <paper.version>1.21.3-R0.1-SNAPSHOT</paper.version>
         <bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.8.0</build.version>
+        <build.version>2.8.1</build.version>
 
         <sonar.projectKey>BentoBoxWorld_Boxed</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -182,7 +182,13 @@
             <artifactId>spigot</artifactId>
             <version>${spigot.version}</version>
             <scope>provided</scope>
-                </dependency>
+        </dependency>
+       <dependency>
+            <groupId>org.spigotmc..</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.21.3-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
              <groupId>org.spigotmc......</groupId>
              <artifactId>spigot</artifactId>

src/main/java/world/bentobox/boxed/listeners/EnderPearlListener.java

@@ -60,6 +60,8 @@ public void onPlayerTeleport(PlayerTeleportEvent e) {
             addon.getIslands().getIslandAt(e.getTo()).ifPresent(i -> {
                 if (!i.onIsland(e.getTo())) {
                     u.sendMessage("boxed.general.errors.no-teleport-outside");
+                    addon.logWarning(e.getPlayer().getName() + " tried to teleport outside of their box from "
+                            + e.getFrom() + " to " + e.getTo());
                     e.setCancelled(true);
                 }
             });
@@ -105,11 +107,15 @@ public void onEnderPearlLand(ProjectileHitEvent e) {
                         // Different box. This is never allowed. Cancel the throw
                         e.setCancelled(true);
                         u.sendMessage("boxed.general.errors.no-teleport-outside");
+                        addon.logWarning("Enderpearl: " + player.getName() + " tried to teleport between boxes from "
+                                + fromIsland.getCenter() + " to " + toIsland.getCenter());
                     }
                 }, () -> {
                     // No box. This is never allowed. Cancel the throw
                     e.setCancelled(true);
                     u.sendMessage("boxed.general.errors.no-teleport-outside");
+                    addon.logWarning("Enderpearl: " + player.getName() + " tried to teleport between boxes from "
+                            + fromIsland.getCenter() + " to some place outside");
                 });
 
             });

src/main/java/world/bentobox/boxed/nms/v1_21_4_R0_1_SNAPSHOT/GetMetaData.java

@@ -0,0 +1,22 @@
+package world.bentobox.boxed.nms.v1_21_4_R0_1_SNAPSHOT;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
+
+import net.minecraft.core.BlockPosition;
+import net.minecraft.world.level.block.entity.TileEntity;
+import world.bentobox.boxed.nms.AbstractMetaData;
+
+public class GetMetaData extends AbstractMetaData {
+
+    @Override
+    public String nmsData(Block block) {
+        Location w = block.getLocation();
+        CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one
+        // for 1.13+ (we have use WorldServer)
+        TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ()));
+        return getData(te, "getUpdatePacket", "tag");
+    }
+
+}