mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
[Bleeding] Check visibility API for sounds. Fixes BUKKIT-2210
This implementation of a visibility API check for sounds was created by adding extra methods carrying the source entity in WorldManager and ServerConfigurationManagerAbstract and adding a test for canSee in the SCMA sendPacketNearby method. This approach involves no logic copying, just method addition. I opted to cast to WorldManager as: 1) IWorldAccess is not in CraftBukkit at the moment 2) There is no other IWorldAccess implemented in CraftBukkit, nor is there likely to be one soon. If that day comes, easy fix.
This commit is contained in:
parent
349cb0bba6
commit
4b1f6aff3f
@ -601,12 +601,27 @@ public abstract class ServerConfigurationManagerAbstract {
|
|||||||
this.sendPacketNearby((EntityHuman) null, d0, d1, d2, d3, i, packet);
|
this.sendPacketNearby((EntityHuman) null, d0, d1, d2, d3, i, packet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CraftBukkit start - Add support for entity who caused the packet
|
||||||
public void sendPacketNearby(EntityHuman entityhuman, double d0, double d1, double d2, double d3, int i, Packet packet) {
|
public void sendPacketNearby(EntityHuman entityhuman, double d0, double d1, double d2, double d3, int i, Packet packet) {
|
||||||
|
this.sendPacketNearby(entityhuman, d0, d1, d2, d3, i, packet, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void sendPacketNearby(double d0, double d1, double d2, double d3, int i, Packet packet, Entity sourceentity) {
|
||||||
|
this.sendPacketNearby(null, d0, d1, d2, d3, i, packet, sourceentity);
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
|
||||||
|
public void sendPacketNearby(EntityHuman entityhuman, double d0, double d1, double d2, double d3, int i, Packet packet, Entity sourceentity) { // CraftBukkit - added sourceentity
|
||||||
Iterator iterator = this.players.iterator();
|
Iterator iterator = this.players.iterator();
|
||||||
|
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
|
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
|
||||||
|
|
||||||
|
// CraftBukkit start - Test if player receiving packet can see the source of the packet
|
||||||
|
if (sourceentity != null && sourceentity instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer)sourceentity).getBukkitEntity())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
if (entityplayer != entityhuman && entityplayer.dimension == i) {
|
if (entityplayer != entityhuman && entityplayer.dimension == i) {
|
||||||
double d4 = d0 - entityplayer.locX;
|
double d4 = d0 - entityplayer.locX;
|
||||||
double d5 = d1 - entityplayer.locY;
|
double d5 = d1 - entityplayer.locY;
|
||||||
|
@ -766,7 +766,7 @@ public abstract class World implements IBlockAccess {
|
|||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
IWorldAccess iworldaccess = (IWorldAccess) iterator.next();
|
IWorldAccess iworldaccess = (IWorldAccess) iterator.next();
|
||||||
|
|
||||||
iworldaccess.a(s, entity.locX, entity.locY - (double) entity.height, entity.locZ, f, f1);
|
((WorldManager) iworldaccess).a(s, entity.locX, entity.locY - (double) entity.height, entity.locZ, f, f1, entity); // CraftBukkit - Cast to WorldManager, add sourceentity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,12 @@ public class WorldManager implements IWorldAccess {
|
|||||||
this.world.getTracker().untrackEntity(entity);
|
this.world.getTracker().untrackEntity(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CraftBukkit start - Add source entity for a sound.
|
||||||
|
public void a(String s, double d0, double d1, double d2, float f, float f1, Entity sourceentity) {
|
||||||
|
this.server.getServerConfigurationManager().sendPacketNearby(d0, d1, d2, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.world.dimension, new Packet62NamedSoundEffect(s, d0, d1, d2, f, f1), sourceentity);
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
|
||||||
public void a(String s, double d0, double d1, double d2, float f, float f1) {
|
public void a(String s, double d0, double d1, double d2, float f, float f1) {
|
||||||
// CraftBukkit - this.world.dimension
|
// CraftBukkit - this.world.dimension
|
||||||
this.server.getServerConfigurationManager().sendPacketNearby(d0, d1, d2, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.world.dimension, new Packet62NamedSoundEffect(s, d0, d1, d2, f, f1));
|
this.server.getServerConfigurationManager().sendPacketNearby(d0, d1, d2, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.world.dimension, new Packet62NamedSoundEffect(s, d0, d1, d2, f, f1));
|
||||||
|
Loading…
Reference in New Issue
Block a user