mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-08 19:34:09 +01:00
08698c4642
* Only send global sounds to same world if limiting radius * respect global sound events gamerule Co-authored-by: Evan McCarthy <evanmccarthy@outlook.com> Co-authored-by: lexikiq <noellekiq@gmail.com> Co-authored-by: Aikar <aikar@aikar.co>
44 lines
3.1 KiB
Diff
44 lines
3.1 KiB
Diff
--- a/net/minecraft/world/item/EnderEyeItem.java
|
|
+++ b/net/minecraft/world/item/EnderEyeItem.java
|
|
@@ -62,7 +62,27 @@
|
|
}
|
|
}
|
|
|
|
- world.globalLevelEvent(1038, blockposition1.offset(1, 0, 1), 0);
|
|
+ // CraftBukkit start - Use relative location for far away sounds
|
|
+ // world.globalLevelEvent(1038, blockposition1.offset(1, 0, 1), 0);
|
|
+ int viewDistance = world.getCraftServer().getViewDistance() * 16;
|
|
+ BlockPos soundPos = blockposition1.offset(1, 0, 1);
|
|
+ final net.minecraft.server.level.ServerLevel serverLevel = (net.minecraft.server.level.ServerLevel) world; // Paper - respect global sound events gamerule - ensured by isClientSide check above
|
|
+ for (ServerPlayer player : serverLevel.getPlayersForGlobalSoundGamerule()) { // Paper - respect global sound events gamerule
|
|
+ double deltaX = soundPos.getX() - player.getX();
|
|
+ double deltaZ = soundPos.getZ() - player.getZ();
|
|
+ double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
|
|
+ final double soundRadiusSquared = serverLevel.getGlobalSoundRangeSquared(config -> config.endPortalSoundRadius); // Paper - respect global sound events gamerule
|
|
+ if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_GLOBAL_SOUND_EVENTS) && distanceSquared > soundRadiusSquared) continue; // Spigot // Paper - respect global sound events gamerule
|
|
+ if (distanceSquared > viewDistance * viewDistance) {
|
|
+ double deltaLength = Math.sqrt(distanceSquared);
|
|
+ double relativeX = player.getX() + (deltaX / deltaLength) * viewDistance;
|
|
+ double relativeZ = player.getZ() + (deltaZ / deltaLength) * viewDistance;
|
|
+ player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelEventPacket(1038, new BlockPos((int) relativeX, (int) soundPos.getY(), (int) relativeZ), 0, true));
|
|
+ } else {
|
|
+ player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelEventPacket(1038, soundPos, 0, true));
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
return InteractionResult.SUCCESS;
|
|
@@ -99,7 +119,11 @@
|
|
entityendersignal.setItem(itemstack);
|
|
entityendersignal.signalTo(blockposition);
|
|
world.gameEvent((Holder) GameEvent.PROJECTILE_SHOOT, entityendersignal.position(), GameEvent.Context.of((Entity) user));
|
|
- world.addFreshEntity(entityendersignal);
|
|
+ // CraftBukkit start
|
|
+ if (!world.addFreshEntity(entityendersignal)) {
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (user instanceof ServerPlayer) {
|
|
ServerPlayer entityplayer = (ServerPlayer) user;
|
|
|