Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 04:35:50 +01:00
Code Issues Projects Releases Wiki Activity

Be more aggressive with bed packets in older minecraft versions

Browse Source
This commit is contained in:
fullwall 2022-12-22 23:35:19 +08:00
parent 4c958b5e7c
commit 8f21f87867
5 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -1201,9 +1201,14 @@ public class NMSImpl implements NMSBridge {
public void sleep(Player entity, boolean sleep) { public void sleep(Player entity, boolean sleep) {
EntityPlayer player = (EntityPlayer) getHandle(entity); EntityPlayer player = (EntityPlayer) getHandle(entity);
if (sleep) { if (sleep) {
PacketPlayOutBed packet = new PacketPlayOutBed(player, Location loc = player.getBukkitEntity().getLocation();
PacketPlayOutBed bed = new PacketPlayOutBed(player,
new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ)); new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ));
sendPacketNearby(entity, entity.getLocation(), packet, 64); for (Player nearby : CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64)) {
nearby.sendBlockChange(loc, Material.BED.getId(), (byte) 11);
sendPacket(nearby, bed);
nearby.sendBlockChange(loc, 0, (byte) 0);
}
} else { } else {
PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2); PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2);
sendPacketNearby(entity, entity.getLocation(), packet, 64); sendPacketNearby(entity, entity.getLocation(), packet, 64);

9
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View File

@ -1268,9 +1268,14 @@ public class NMSImpl implements NMSBridge {
public void sleep(Player entity, boolean sleep) { public void sleep(Player entity, boolean sleep) {
EntityPlayer player = (EntityPlayer) getHandle(entity); EntityPlayer player = (EntityPlayer) getHandle(entity);
if (sleep) { if (sleep) {
PacketPlayOutBed packet = new PacketPlayOutBed(player, Location loc = player.getBukkitEntity().getLocation();
PacketPlayOutBed bed = new PacketPlayOutBed(player,
new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ)); new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ));
sendPacketNearby(entity, entity.getLocation(), packet, 64); for (Player nearby : CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64)) {
nearby.sendBlockChange(loc, Material.BED.getId(), (byte) 11);
sendPacket(nearby, bed);
nearby.sendBlockChange(loc, 0, (byte) 0);
}
} else { } else {
PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2); PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2);
sendPacketNearby(entity, entity.getLocation(), packet, 64); sendPacketNearby(entity, entity.getLocation(), packet, 64);

9
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View File

@ -1278,9 +1278,14 @@ public class NMSImpl implements NMSBridge {
public void sleep(Player entity, boolean sleep) { public void sleep(Player entity, boolean sleep) {
EntityPlayer player = (EntityPlayer) getHandle(entity); EntityPlayer player = (EntityPlayer) getHandle(entity);
if (sleep) { if (sleep) {
PacketPlayOutBed packet = new PacketPlayOutBed(player, Location loc = player.getBukkitEntity().getLocation();
PacketPlayOutBed bed = new PacketPlayOutBed(player,
new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ)); new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ));
sendPacketNearby(entity, entity.getLocation(), packet, 64); for (Player nearby : CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64)) {
nearby.sendBlockChange(loc, Material.BED.getId(), (byte) 11);
sendPacket(nearby, bed);
nearby.sendBlockChange(loc, 0, (byte) 0);
}
} else { } else {
PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2); PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2);
sendPacketNearby(entity, entity.getLocation(), packet, 64); sendPacketNearby(entity, entity.getLocation(), packet, 64);

9
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
View File

@ -1318,9 +1318,14 @@ public class NMSImpl implements NMSBridge {
public void sleep(Player entity, boolean sleep) { public void sleep(Player entity, boolean sleep) {
EntityPlayer player = (EntityPlayer) getHandle(entity); EntityPlayer player = (EntityPlayer) getHandle(entity);
if (sleep) { if (sleep) {
PacketPlayOutBed packet = new PacketPlayOutBed(player, Location loc = player.getBukkitEntity().getLocation();
PacketPlayOutBed bed = new PacketPlayOutBed(player,
new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ)); new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ));
sendPacketNearby(entity, entity.getLocation(), packet, 64); for (Player nearby : CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64)) {
nearby.sendBlockChange(loc, Material.BLACK_BED, (byte) 11);
sendPacket(nearby, bed);
nearby.sendBlockChange(loc, Material.AIR, (byte) 0);
}
} else { } else {
PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2); PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2);
sendPacketNearby(entity, entity.getLocation(), packet, 64); sendPacketNearby(entity, entity.getLocation(), packet, 64);

9
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
View File

@ -1138,9 +1138,14 @@ public class NMSImpl implements NMSBridge {
public void sleep(Player entity, boolean sleep) { public void sleep(Player entity, boolean sleep) {
EntityPlayer player = (EntityPlayer) getHandle(entity); EntityPlayer player = (EntityPlayer) getHandle(entity);
if (sleep) { if (sleep) {
PacketPlayOutBed packet = new PacketPlayOutBed(player, Location loc = player.getBukkitEntity().getLocation();
PacketPlayOutBed bed = new PacketPlayOutBed(player,
new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ)); new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ));
sendPacketNearby(entity, entity.getLocation(), packet, 64); for (Player nearby : CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64)) {
nearby.sendBlockChange(loc, Material.BED.getId(), (byte) 11);
sendPacket(nearby, bed);
nearby.sendBlockChange(loc, 0, (byte) 0);
}
} else { } else {
PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2); PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, 2);
sendPacketNearby(entity, entity.getLocation(), packet, 64); sendPacketNearby(entity, entity.getLocation(), packet, 64);