Skip to content

Commit 53cc201

Browse files
committed
Added support for 1.21.4
1 parent 50a4763 commit 53cc201

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- Non-minecraft related dependencies -->
5555
<powermock.version>2.0.9</powermock.version>
5656
<!-- More visible way how to change dependency versions -->
57-
<spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
57+
<spigot.version>1.21.4-R0.1-SNAPSHOT</spigot.version>
5858
<paper.version>1.21.3-R0.1-SNAPSHOT</paper.version>
5959
<bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
6060
<!-- Revision variable removes warning about dynamic version -->
@@ -182,7 +182,13 @@
182182
<artifactId>spigot</artifactId>
183183
<version>${spigot.version}</version>
184184
<scope>provided</scope>
185-
</dependency>
185+
</dependency>
186+
<dependency>
187+
<groupId>org.spigotmc..</groupId>
188+
<artifactId>spigot</artifactId>
189+
<version>1.21.3-R0.1-SNAPSHOT</version>
190+
<scope>provided</scope>
191+
</dependency>
186192
<dependency>
187193
<groupId>org.spigotmc......</groupId>
188194
<artifactId>spigot</artifactId>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public void onPlayerTeleport(PlayerTeleportEvent e) {
6060
addon.getIslands().getIslandAt(e.getTo()).ifPresent(i -> {
6161
if (!i.onIsland(e.getTo())) {
6262
u.sendMessage("boxed.general.errors.no-teleport-outside");
63+
addon.logWarning(e.getPlayer().getName() + " tried to teleport outside of their box from "
64+
+ e.getFrom() + " to " + e.getTo());
6365
e.setCancelled(true);
6466
}
6567
});
@@ -105,11 +107,15 @@ public void onEnderPearlLand(ProjectileHitEvent e) {
105107
// Different box. This is never allowed. Cancel the throw
106108
e.setCancelled(true);
107109
u.sendMessage("boxed.general.errors.no-teleport-outside");
110+
addon.logWarning("Enderpearl: " + player.getName() + " tried to teleport between boxes from "
111+
+ fromIsland.getCenter() + " to " + toIsland.getCenter());
108112
}
109113
}, () -> {
110114
// No box. This is never allowed. Cancel the throw
111115
e.setCancelled(true);
112116
u.sendMessage("boxed.general.errors.no-teleport-outside");
117+
addon.logWarning("Enderpearl: " + player.getName() + " tried to teleport between boxes from "
118+
+ fromIsland.getCenter() + " to some place outside");
113119
});
114120

115121
});
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package world.bentobox.boxed.nms.v1_21_4_R0_1_SNAPSHOT;
2+
3+
import org.bukkit.Location;
4+
import org.bukkit.block.Block;
5+
import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
6+
7+
import net.minecraft.core.BlockPosition;
8+
import net.minecraft.world.level.block.entity.TileEntity;
9+
import world.bentobox.boxed.nms.AbstractMetaData;
10+
11+
public class GetMetaData extends AbstractMetaData {
12+
13+
@Override
14+
public String nmsData(Block block) {
15+
Location w = block.getLocation();
16+
CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one
17+
// for 1.13+ (we have use WorldServer)
18+
TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ()));
19+
return getData(te, "getUpdatePacket", "tag");
20+
}
21+
22+
}

0 commit comments

Comments
 (0)