SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AT bullshit

Browse Source
This commit is contained in:
MiniDigger | Martin
2021-06-16 00:24:12 +02:00
parent 2eb94202ea
commit a1d90ea32f
48 changed files with 191 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/Improve-death-events.patch
View File

@@ -194,25 +194,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// CraftBukkit start
public int getExpReward() {
@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
return SoundEvents.GENERIC_HURT;
}
+
@Nullable
- protected SoundEvent getDeathSound() {
+ public final SoundEvent getDeathSoundPublic() { return this.getDeathSound(); } protected SoundEvent getDeathSound() { // Paper - provide PUBLIC accessor, overrides are hell to deal with
+ protected SoundEvent getDeathSound() { return getDeathSoundPublic(); } public SoundEvent getDeathSoundPublic() { // Paper - public OBFHELPER
return SoundEvents.GENERIC_DEATH;
}
@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
}
- protected float getSoundVolume() {
+ public final float getSoundVolumePublic() { return this.getSoundVolume(); } protected float getSoundVolume() { // Paper - provide PUBLIC accessor, overrides are hell
return 1.0F;
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -354,7 +343,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ net.minecraft.sounds.SoundEvent soundEffect = victim.getDeathSoundPublic();
+ event.setDeathSound(soundEffect != null ? org.bukkit.craftbukkit.CraftSound.getBukkit(soundEffect) : null);
+ event.setDeathSoundCategory(org.bukkit.SoundCategory.valueOf(victim.getSoundSource().name()));
+ event.setDeathSoundVolume(victim.getSoundVolumePublic());
+ event.setDeathSoundVolume(victim.getSoundVolume());
+ event.setDeathSoundPitch(victim.getVoicePitch());
+ }
+