geforkt von Mirrors/Paper
40 Zeilen
3.5 KiB
Diff
40 Zeilen
3.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Tue, 31 May 2016 22:53:50 -0400
|
||
|
|
Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
|
||
|
|
|
||
|
|
Also fix view distance lookup
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
|
||
|
|
index 6c58cf9d39cc0f0eb0dc7ddb126b8a3cf6a08fe7..74802de01dba30e38e09f6fc1f61e7bb64cf5f09 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
|
||
|
|
@@ -619,8 +619,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
||
|
|
if (this.deathAnimationTicks == 1 && !this.isSilent()) {
|
||
|
|
// CraftBukkit start - Use relative location for far away sounds
|
||
|
|
// this.world.b(1028, this.getChunkCoordinates(), 0);
|
||
|
|
- int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16;
|
||
|
|
- for (net.minecraft.server.level.EntityPlayer player : this.world.getMinecraftServer().getPlayerList().players) {
|
||
|
|
+ //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
|
||
|
|
+ for (net.minecraft.server.level.EntityPlayer player : (List<net.minecraft.server.level.EntityPlayer>) ((WorldServer)world).getPlayers()) {
|
||
|
|
+ final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
|
||
|
|
double deltaX = this.locX() - player.locX();
|
||
|
|
double deltaZ = this.locZ() - player.locZ();
|
||
|
|
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
|
||
|
|
index f74949c855aea32ceb16d8cb07f266d50045b57e..145767e8b0fc4105a0afa47af17dcdbb75e952bc 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
|
||
|
|
@@ -258,8 +258,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||
|
|
if (!this.isSilent()) {
|
||
|
|
// CraftBukkit start - Use relative location for far away sounds
|
||
|
|
// this.world.b(1023, new BlockPosition(this), 0);
|
||
|
|
- int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16;
|
||
|
|
- for (EntityPlayer player : (List<EntityPlayer>) MinecraftServer.getServer().getPlayerList().players) {
|
||
|
|
+ //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
|
||
|
|
+ for (EntityPlayer player : (List<EntityPlayer>)this.world.getPlayers()) {
|
||
|
|
+ final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
|
||
|
|
double deltaX = this.locX() - player.locX();
|
||
|
|
double deltaZ = this.locZ() - player.locZ();
|
||
|
|
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
|