OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Removed paper comments

Browse source
This commit is contained in:
Chaosdave34 2024-12-23 13:55:55 +01:00
parent a89eef24d8
commit d56b3b92fb
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-api/src/main/java/org/bukkit/UnsafeValues.java
View file

@ -125,7 +125,7 @@ public interface UnsafeValues {
@ApiStatus.Internal @ApiStatus.Internal
@Nullable @Nullable
@Deprecated // Paper @Deprecated
DamageEffect getDamageEffect(@NotNull String key); DamageEffect getDamageEffect(@NotNull String key);
/** /**

2
paper-api/src/main/java/org/bukkit/damage/DamageEffect.java
View file

@ -6,7 +6,6 @@ import org.bukkit.Sound;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
// Paper start
/** /**
* Represents a type of effect that occurs when damage is inflicted. Currently, * Represents a type of effect that occurs when damage is inflicted. Currently,
* effects only determine the sound that plays. * effects only determine the sound that plays.
@ -55,4 +54,3 @@ public enum DamageEffect {
return Bukkit.getUnsafe().getSoundForDamageEffect(this); return Bukkit.getUnsafe().getSoundForDamageEffect(this);
} }
} }
// Paper end

6
paper-server/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageEffect.java
View file

@ -5,10 +5,8 @@ import org.bukkit.Sound;
import org.bukkit.craftbukkit.CraftSound; import org.bukkit.craftbukkit.CraftSound;
import org.bukkit.damage.DamageEffect; import org.bukkit.damage.DamageEffect;
// Paper start
@Deprecated @Deprecated
public class CraftDamageEffect { public class CraftDamageEffect {
// Paper end
private final DamageEffects damageEffects; private final DamageEffects damageEffects;
@ -21,7 +19,7 @@ public class CraftDamageEffect {
} }
public Sound getSound() { public Sound getSound() {
return CraftSound.minecraftToBukkit(this.getHandle().sound()); // Paper return CraftSound.minecraftToBukkit(this.getHandle().sound());
} }
public static DamageEffect getById(String id) { public static DamageEffect getById(String id) {
@ -34,6 +32,6 @@ public class CraftDamageEffect {
} }
public static DamageEffect toBukkit(DamageEffects damageEffects) { public static DamageEffect toBukkit(DamageEffects damageEffects) {
return CraftDamageType.damageEffectToBukkit(damageEffects); // Paper return CraftDamageType.damageEffectToBukkit(damageEffects);
} }
} }

2
paper-server/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageType.java
View file

@ -98,7 +98,6 @@ public class CraftDamageType implements DamageType, Handleable<net.minecraft.wor
}; };
} }
// Paper start
public static DamageEffect damageEffectToBukkit(net.minecraft.world.damagesource.DamageEffects damageEffect) { public static DamageEffect damageEffectToBukkit(net.minecraft.world.damagesource.DamageEffects damageEffect) {
return switch (damageEffect) { return switch (damageEffect) {
case HURT -> DamageEffect.HURT; case HURT -> DamageEffect.HURT;
@ -122,7 +121,6 @@ public class CraftDamageType implements DamageType, Handleable<net.minecraft.wor
default -> throw new IllegalArgumentException("Bukkit DamageEffect." + damageEffect + " cannot be converted to a NMS DamageEffect"); default -> throw new IllegalArgumentException("Bukkit DamageEffect." + damageEffect + " cannot be converted to a NMS DamageEffect");
}; };
} }
// Paper end
public static DamageType minecraftHolderToBukkit(Holder<net.minecraft.world.damagesource.DamageType> minecraftHolder) { public static DamageType minecraftHolderToBukkit(Holder<net.minecraft.world.damagesource.DamageType> minecraftHolder) {
return CraftDamageType.minecraftToBukkit(minecraftHolder.value()); return CraftDamageType.minecraftToBukkit(minecraftHolder.value());