tweaks

Lulu13022002 · Lulu13022002 · commit 7b5aaf79274a · 2026-01-29T21:33:58.000+01:00
diff --git a/paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java b/paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java
@@ -145,8 +145,6 @@ public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
      */
     RegistryKey<StatisticType<?>> STAT_TYPE = create("stat_type");
 
-
-
     /* ********************** *
      * Data-driven Registries *
      * ********************** */
diff --git a/paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistic.java b/paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistic.java
@@ -15,7 +15,7 @@ public interface CustomStatistic extends Keyed, Translatable {
     /**
      * Gets the statistic with the given custom stat.
      *
-     * @return the statistic for the custom stat.
+     * @return the statistic for the custom stat
      */
     default Statistic<CustomStatistic> stat() {
         return StatisticTypes.CUSTOM.forValue(this);
diff --git a/paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistics.java b/paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistics.java
@@ -165,7 +165,7 @@ public final class CustomStatistics {
     public static final CustomStatistic WALK_UNDER_WATER_ONE_CM = get("walk_under_water_one_cm");
     // End generate - CustomStatistics
 
-    private static CustomStatistic get(@KeyPattern.Value final String key) {
+    private static CustomStatistic get(final @KeyPattern.Value String key) {
         return Registry.CUSTOM_STAT.getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));
     }
 
diff --git a/paper-api/src/main/java/io/papermc/paper/statistic/Statistic.java b/paper-api/src/main/java/io/papermc/paper/statistic/Statistic.java
@@ -7,7 +7,7 @@
  * Represents an individual statistic. Obtained via {@link StatisticType#forValue(Object)}.
  * Can be used as a criteria for {@link org.bukkit.scoreboard.Scoreboard#registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
  *
- * @param <S> stat value type.
+ * @param <S> stat value type
  */
 @ApiStatus.NonExtendable
 public interface Statistic<S> extends Criteria {
diff --git a/paper-api/src/main/java/io/papermc/paper/statistic/StatisticType.java b/paper-api/src/main/java/io/papermc/paper/statistic/StatisticType.java
@@ -14,7 +14,6 @@
 @ApiStatus.NonExtendable
 public interface StatisticType<S> extends Keyed, Translatable {
 
-
     /**
      * Creates or gets the statistic from this type for the specified value.
      *
diff --git a/paper-api/src/main/java/io/papermc/paper/statistic/StatisticTypes.java b/paper-api/src/main/java/io/papermc/paper/statistic/StatisticTypes.java
@@ -33,7 +33,7 @@ public final class StatisticTypes {
     // End generate - StatisticTypes
 
     @SuppressWarnings("unchecked")
-    private static <S> StatisticType<S> get(@KeyPattern.Value final String key) {
+    private static <S> StatisticType<S> get(final @KeyPattern.Value String key) {
         return (StatisticType<S>) Registry.STAT_TYPE.getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/OfflinePlayer.java b/paper-api/src/main/java/org/bukkit/OfflinePlayer.java
@@ -13,6 +13,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.ServerOperator;
 import org.bukkit.profile.PlayerProfile;
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.index.qual.Positive;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -315,19 +317,19 @@ default void incrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
      *
      * @param statistic the stat to decrement
      * @param amount the value to decrement by
-     * @throws IllegalArgumentException if amount is negative
+     * @throws IllegalArgumentException if amount is negative or 0
      * @throws IllegalArgumentException if the stat would have a negative value after decrementing it
      */
-    void decrementStatistic(final io.papermc.paper.statistic.Statistic<?> statistic, final int amount);
+    void decrementStatistic(io.papermc.paper.statistic.Statistic<?> statistic, @Positive int amount);
 
     /**
      * Increments the given stat for this player.
      *
      * @param statistic the stat to increment
      * @param amount the amount to increment by
-     * @throws IllegalArgumentException if amount is negative
+     * @throws IllegalArgumentException if amount is negative or 0
      */
-    void incrementStatistic(io.papermc.paper.statistic.Statistic<?> statistic, int amount);
+    void incrementStatistic(io.papermc.paper.statistic.Statistic<?> statistic, @Positive int amount);
 
     /**
      * Sets the given stat for this player.
@@ -336,7 +338,7 @@ default void incrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
      * @param newAmount the value to set the stat to
      * @throws IllegalArgumentException if the amount is negative
      */
-    void setStatistic(io.papermc.paper.statistic.Statistic<?> statistic, int newAmount);
+    void setStatistic(io.papermc.paper.statistic.Statistic<?> statistic, @NonNegative int newAmount);
 
     /**
      * Gets the given stat for this player.
@@ -394,8 +396,7 @@ default void incrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
      */
     @Deprecated(since = "1.21.11")
     default void incrementStatistic(Statistic statistic) throws IllegalArgumentException {
-        Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
-        this.incrementStatistic(statistic.toModern(null, null));
+        this.incrementStatistic(statistic, 1);
     }
 
     /**
@@ -413,8 +414,7 @@ default void incrementStatistic(Statistic statistic) throws IllegalArgumentExcep
      */
     @Deprecated(since = "1.21.11")
     default void decrementStatistic(Statistic statistic) throws IllegalArgumentException {
-        Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
-        this.decrementStatistic(statistic.toModern(null, null));
+        this.decrementStatistic(statistic, 1);
     }
 
     /**
diff --git a/paper-server/patches/sources/net/minecraft/stats/StatsCounter.java.patch b/paper-server/patches/sources/net/minecraft/stats/StatsCounter.java.patch
@@ -1,12 +1,11 @@
 --- a/net/minecraft/stats/StatsCounter.java
 +++ b/net/minecraft/stats/StatsCounter.java
-@@ -14,6 +_,12 @@
+@@ -14,6 +_,11 @@
  
      public void increment(Player player, Stat<?> stat, int amount) {
          int i = (int)Math.min((long)this.getValue(stat) + amount, 2147483647L);
 +        // CraftBukkit start - fire Statistic events
-+        org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(player, stat, this.getValue(stat), i);
-+        if (cancellable != null && cancellable.isCancelled()) {
++        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callStatisticIncreaseEvent(player, stat, this.getValue(stat), i)) {
 +            return;
 +        }
 +        // CraftBukkit end
diff --git a/paper-server/src/main/java/io/papermc/paper/statistic/PaperStatistic.java b/paper-server/src/main/java/io/papermc/paper/statistic/PaperStatistic.java
@@ -8,7 +8,7 @@ public record PaperStatistic<S, M>(Stat<M> handle, S owner, M nmsValue, Statisti
 
     @Override
     public String getName() {
-        return Stat.buildName(this.handle.getType(),this.nmsValue);
+        return Stat.buildName(this.handle.getType(), this.nmsValue);
     }
 
     @Override
diff --git a/paper-server/src/main/java/io/papermc/paper/statistic/PaperStatisticType.java b/paper-server/src/main/java/io/papermc/paper/statistic/PaperStatisticType.java
@@ -22,9 +22,8 @@
 import org.bukkit.craftbukkit.CraftRegistry;
 import org.bukkit.craftbukkit.entity.CraftEntityType;
 import org.bukkit.entity.EntityType;
-import org.jspecify.annotations.NonNull;
 
-public class PaperStatisticType<S extends @NonNull Keyed, M> extends HolderableBase<StatType<M>> implements StatisticType<S> {
+public class PaperStatisticType<S extends Keyed, M> extends HolderableBase<StatType<M>> implements StatisticType<S> {
 
     private final Supplier<RegistryKey<S>> registryKey;
     private final Map<S, Statistic<S>> statCacheMap;
@@ -46,25 +45,25 @@ private PaperStatisticType(final Holder<StatType<M>> holder, final Predicate<S>
     }
 
     @SuppressWarnings("unchecked")
-    public static <M> StatisticType<?> create(final Holder<StatType<?>> holder) {
-        // don't call .value() here, its unbound
+    public static <M> StatisticType<?> create(final Holder<?> holder) {
+        // don't call .value() here, it's unbound
         if (holder.is(Identifier.withDefaultNamespace("killed")) || holder.is(Identifier.withDefaultNamespace("killed_by"))) {
             return new PaperStatisticType<>(
-                (Holder<StatType<net.minecraft.world.entity.EntityType<?>>>) (Holder<?>) holder,
+                (Holder<StatType<net.minecraft.world.entity.EntityType<?>>>) holder,
                 t -> t != EntityType.UNKNOWN,
                 CraftEntityType::bukkitToMinecraft,
                 (entityType, ignored) -> CraftEntityType.minecraftToBukkit(entityType)
             );
         } else {
-            return new PaperStatisticType<>((Holder<StatType<M>>) (Holder<?>) holder);
+            return new PaperStatisticType<>((Holder<StatType<M>>) holder);
         }
     }
 
-    public static <A, M> StatisticType<A> minecraftToBukkit(final StatType<M> minecraft) {
+    public static <S extends Keyed, M> PaperStatisticType<S, M> minecraftToBukkit(final StatType<M> minecraft) {
         return CraftRegistry.minecraftToBukkit(minecraft, Registries.STAT_TYPE);
     }
 
-    public static <A, M> StatType<M> bukkitToMinecraft(final StatisticType<A> bukkit) {
+    public static <S, M> StatType<M> bukkitToMinecraft(final StatisticType<S> bukkit) {
         return CraftRegistry.bukkitToMinecraft(bukkit);
     }
 
@@ -79,9 +78,9 @@ public Statistic<S> forValue(final S value) {
         }
         return this.statCacheMap.computeIfAbsent(
             value, newValue -> {
-                final M nmsValue = this.bukkitToMinecraft.apply(value);
+                final M nmsValue = this.bukkitToMinecraft.apply(newValue);
                 final Stat<M> nmsStat = this.getHandle().get(nmsValue);
-                return new PaperStatistic<>(nmsStat, value, nmsValue, this);
+                return new PaperStatistic<>(nmsStat, newValue, nmsValue, this);
             }
         );
     }
@@ -93,7 +92,7 @@ public RegistryKey<S> registryKey() {
 
     @Override
     public String translationKey() {
-        Preconditions.checkArgument(this != StatisticTypes.CUSTOM, this.key() + " does not have a translation key, see CustomStatistic#translationKey()");
+        Preconditions.checkArgument(this != StatisticTypes.CUSTOM, this.getKey() + " does not have a translation key, see CustomStatistic#translationKey()");
         return "stat_type." + this.getKey().toString().replace(':', '.');
     }
 }
diff --git a/paper-server/src/main/java/io/papermc/paper/statistic/PaperStatistics.java b/paper-server/src/main/java/io/papermc/paper/statistic/PaperStatistics.java
@@ -3,25 +3,26 @@
 import com.google.common.base.Preconditions;
 import java.util.HashSet;
 import java.util.Set;
-import net.kyori.adventure.key.Key;
-import net.minecraft.util.Util;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.Identifier;
 import net.minecraft.stats.ServerStatsCounter;
 import net.minecraft.stats.Stat;
+import net.minecraft.stats.Stats;
+import net.minecraft.util.Util;
 import net.minecraft.world.entity.player.Player;
-import org.bukkit.Registry;
 import org.jspecify.annotations.Nullable;
 
 public final class PaperStatistics {
 
-    public static final Set<Key> IGNORED_STATS_FOR_EVENT = Util.make(new HashSet<>(), set -> {
-        set.add(CustomStatistics.TIME_SINCE_DEATH.key());
-        set.add(CustomStatistics.TIME_SINCE_REST.key());
-        set.add(CustomStatistics.SNEAK_TIME.key());
-        set.add(CustomStatistics.TOTAL_WORLD_TIME.key());
-        set.add(CustomStatistics.PLAY_TIME.key());
+    public static final Set<Identifier> IGNORED_STATS_FOR_EVENT = Util.make(new HashSet<>(), set -> {
+        set.add(Stats.TIME_SINCE_DEATH);
+        set.add(Stats.TIME_SINCE_REST);
+        set.add(Stats.CROUCH_TIME);
+        set.add(Stats.TOTAL_WORLD_TIME);
+        set.add(Stats.PLAY_TIME);
 
-        Registry.CUSTOM_STAT.keyStream().forEach(key -> {
-            if (key.key().value().endsWith("_one_cm")) {
+        BuiltInRegistries.CUSTOM_STAT.stream().forEach(key -> {
+            if (key.getPath().endsWith("_one_cm")) {
                 set.add(key);
             }
         });
@@ -31,24 +32,20 @@ private PaperStatistics() {
     }
 
     public static void changeStatistic(final ServerStatsCounter manager, final Statistic<?> statistic, final int delta, final @Nullable Player player) {
-        if (delta == 0) return;
         Preconditions.checkArgument(statistic != null, "statistic cannot be null");
         final Stat<?> stat = getNMSStatistic(statistic);
-        final int newAmount = manager.getValue(stat) + delta;
-        Preconditions.checkArgument(newAmount >= 0, "New amount must be greater than or equal to 0");
-        //noinspection ConstantConditions
-        manager.setValue(player, stat, newAmount);
-        if (player != null) {
-            player.level().getCraftServer().getScoreboardManager().forAllObjectives(stat, player, score -> {
-                score.set(newAmount);
-            });
-        }
+        final int newAmount = (int) Math.min((long) manager.getValue(stat) + delta, Integer.MAX_VALUE); // clamp from StatsCounter
+        setStatistic0(manager, stat, newAmount, player);
     }
 
     public static void setStatistic(final ServerStatsCounter manager, final Statistic<?> statistic, final int newAmount, final @Nullable Player player) {
         Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
-        Preconditions.checkArgument(newAmount >= 0, "New amount must be greater than or equal to 0");
         final Stat<?> stat = getNMSStatistic(statistic);
+        setStatistic0(manager, stat, newAmount, player);
+    }
+
+    private static void setStatistic0(final ServerStatsCounter manager, final Stat<?> stat, final int newAmount, final @Nullable Player player) {
+        Preconditions.checkArgument(newAmount >= 0, "New amount must be greater than or equal to 0");
         //noinspection ConstantConditions
         manager.setValue(player, stat, newAmount);
         if (player != null) {
@@ -68,13 +65,11 @@ public static String getFormattedValue(final ServerStatsCounter manager, final S
         return nmsStat.format(manager.getValue(nmsStat));
     }
 
-    @SuppressWarnings("unchecked")
-    public static <M> Statistic<?> getPaperStatistic(final Stat<M> nmsStat) {
-        final PaperStatisticType<?, M> type = (PaperStatisticType<?, M>) PaperStatisticType.minecraftToBukkit(nmsStat.getType());
-        return type.convertStat(nmsStat);
+    public static <M> Statistic<?> getPaperStatistic(final Stat<M> stat) {
+        return PaperStatisticType.minecraftToBukkit(stat.getType()).convertStat(stat);
     }
 
-    public static Stat<?> getNMSStatistic(final Statistic<?> paperStat) {
-        return ((PaperStatistic<?, ?>) paperStat).handle();
+    public static Stat<?> getNMSStatistic(final Statistic<?> statistic) {
+        return ((PaperStatistic<?, ?>) statistic).handle();
     }
 }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -391,8 +391,9 @@ private ServerStatsCounter getStatisticManager() {
     @Override
     public void decrementStatistic(final Statistic<?> statistic, final int amount) {
         Preconditions.checkArgument(amount > 0, "Amount must be greater than 0");
-        if (this.isOnline()) {
-            this.getPlayer().decrementStatistic(statistic, amount);
+        final Player player = this.getPlayer();
+        if (player != null) {
+            player.decrementStatistic(statistic, amount);
         } else {
             final ServerStatsCounter manager = this.getStatisticManager();
             PaperStatistics.changeStatistic(manager, statistic, -amount, null);
@@ -403,20 +404,21 @@ public void decrementStatistic(final Statistic<?> statistic, final int amount) {
     @Override
     public void incrementStatistic(final Statistic<?> statistic, final int amount) {
         Preconditions.checkArgument(amount > 0, "Amount must be greater than 0");
-        if (this.isOnline()) {
-            this.getPlayer().incrementStatistic(statistic, amount);
+        final Player player = this.getPlayer();
+        if (player != null) {
+            player.incrementStatistic(statistic, amount);
         } else {
             final ServerStatsCounter manager = this.getStatisticManager();
             PaperStatistics.changeStatistic(manager, statistic, amount, null);
             manager.save();
         }
-
     }
 
     @Override
     public void setStatistic(final Statistic<?> statistic, final int newAmount) {
-        if (this.isOnline()) {
-            this.getPlayer().setStatistic(statistic, newAmount);
+        final Player player = this.getPlayer();
+        if (player != null) {
+            player.setStatistic(statistic, newAmount);
         } else {
             final ServerStatsCounter manager = this.getStatisticManager();
             PaperStatistics.setStatistic(manager, statistic, newAmount, null);
@@ -426,17 +428,19 @@ public void setStatistic(final Statistic<?> statistic, final int newAmount) {
 
     @Override
     public int getStatistic(final Statistic<?> statistic) {
-        if (this.isOnline()) {
-            return this.getPlayer().getStatistic(statistic);
+        final Player player = this.getPlayer();
+        if (player != null) {
+            return player.getStatistic(statistic);
         } else {
             return PaperStatistics.getStatistic(this.getStatisticManager(), statistic);
         }
     }
 
     @Override
     public String getFormattedValue(final Statistic<?> statistic) {
-        if (this.isOnline()) {
-            return this.getPlayer().getFormattedValue(statistic);
+        final Player player = this.getPlayer();
+        if (player != null) {
+            return player.getFormattedValue(statistic);
         } else {
             return PaperStatistics.getFormattedValue(this.getStatisticManager(), statistic);
         }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -30,6 +30,7 @@
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -136,7 +137,6 @@
 import org.bukkit.entity.Vehicle;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.Villager.Profession;
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.Event.Result;
 import org.bukkit.event.block.Action;
@@ -1695,16 +1695,14 @@ public static PlayerShearEntityEvent handlePlayerShearEntityEvent(net.minecraft.
         return event; // Paper - custom shear drops
     }
 
-    public static Cancellable handleStatisticsIncrease(final net.minecraft.world.entity.player.Player entityHuman, final Stat<?> statistic, final int current, final int newValue) {
-        final Player player = ((ServerPlayer) entityHuman).getBukkitEntity();
-        final Statistic<?> stat = PaperStatistics.getPaperStatistic(statistic);
-        if (stat.owner() instanceof final CustomStatistic customStatistic && PaperStatistics.IGNORED_STATS_FOR_EVENT.contains(customStatistic.key())) {
+    public static boolean callStatisticIncreaseEvent(final net.minecraft.world.entity.player.Player player, final Stat<?> stat, final int currentValue, final int newValue) {
+        if (stat.getValue() instanceof final Identifier key && PaperStatistics.IGNORED_STATS_FOR_EVENT.contains(key)) {
             // Do not process event for these - too spammy
-            return null;
+            return true;
         }
-        final Event event = new PlayerStatisticIncrementEvent(player, stat, current, newValue);
-        event.callEvent();
-        return (Cancellable) event;
+
+        final Statistic<?> statistic = PaperStatistics.getPaperStatistic(stat);
+        return new PlayerStatisticIncrementEvent(((ServerPlayer) player).getBukkitEntity(), statistic, currentValue, newValue).callEvent();
     }
 
     public static boolean callFireworkExplodeEvent(FireworkRocketEntity firework) {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public interface CustomStatistic extends Keyed, Translatable {`
`15`	`15`	`/**`
`16`	`16`	`* Gets the statistic with the given custom stat.`
`17`	`17`	`*`
`18`		`- * @return the statistic for the custom stat.`
	`18`	`+ * @return the statistic for the custom stat`
`19`	`19`	`*/`
`20`	`20`	`default Statistic<CustomStatistic> stat() {`
`21`	`21`	`return StatisticTypes.CUSTOM.forValue(this);`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public final class CustomStatistics {`
`165`	`165`	`public static final CustomStatistic WALK_UNDER_WATER_ONE_CM = get("walk_under_water_one_cm");`
`166`	`166`	`// End generate - CustomStatistics`
`167`	`167`
`168`		`- private static CustomStatistic get(@KeyPattern.Value final String key) {`
	`168`	`+ private static CustomStatistic get(final @KeyPattern.Value String key) {`
`169`	`169`	`return Registry.CUSTOM_STAT.getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Represents an individual statistic. Obtained via {@link StatisticType#forValue(Object)}.`
`8`	`8`	`* Can be used as a criteria for {@link org.bukkit.scoreboard.Scoreboard#registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}`
`9`	`9`	`*`
`10`		`- * @param <S> stat value type.`
	`10`	`+ * @param <S> stat value type`
`11`	`11`	`*/`
`12`	`12`	`@ApiStatus.NonExtendable`
`13`	`13`	`public interface Statistic<S> extends Criteria {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`@ApiStatus.NonExtendable`
`15`	`15`	`public interface StatisticType<S> extends Keyed, Translatable {`
`16`	`16`
`17`		`-`
`18`	`17`	`/**`
`19`	`18`	`* Creates or gets the statistic from this type for the specified value.`
`20`	`19`	`*`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public final class StatisticTypes {`
`33`	`33`	`// End generate - StatisticTypes`
`34`	`34`
`35`	`35`	`@SuppressWarnings("unchecked")`
`36`		`- private static <S> StatisticType<S> get(@KeyPattern.Value final String key) {`
	`36`	`+ private static <S> StatisticType<S> get(final @KeyPattern.Value String key) {`
`37`	`37`	`return (StatisticType<S>) Registry.STAT_TYPE.getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public record PaperStatistic<S, M>(Stat<M> handle, S owner, M nmsValue, Statisti`
`8`	`8`
`9`	`9`	`@Override`
`10`	`10`	`public String getName() {`
`11`		`- return Stat.buildName(this.handle.getType(),this.nmsValue);`
	`11`	`+ return Stat.buildName(this.handle.getType(), this.nmsValue);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@`
`22`	`22`	`import org.bukkit.craftbukkit.CraftRegistry;`
`23`	`23`	`import org.bukkit.craftbukkit.entity.CraftEntityType;`
`24`	`24`	`import org.bukkit.entity.EntityType;`
`25`		`-import org.jspecify.annotations.NonNull;`
`26`	`25`
`27`		`-public class PaperStatisticType<S extends @NonNull Keyed, M> extends HolderableBase<StatType<M>> implements StatisticType<S> {`
	`26`	`+public class PaperStatisticType<S extends Keyed, M> extends HolderableBase<StatType<M>> implements StatisticType<S> {`
`28`	`27`
`29`	`28`	`private final Supplier<RegistryKey<S>> registryKey;`
`30`	`29`	`private final Map<S, Statistic<S>> statCacheMap;`
`@@ -46,25 +45,25 @@ private PaperStatisticType(final Holder<StatType<M>> holder, final Predicate<S>`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`@SuppressWarnings("unchecked")`
`49`		`- public static <M> StatisticType<?> create(final Holder<StatType<?>> holder) {`
`50`		`- // don't call .value() here, its unbound`
	`48`	`+ public static <M> StatisticType<?> create(final Holder<?> holder) {`
	`49`	`+ // don't call .value() here, it's unbound`
`51`	`50`	`if (holder.is(Identifier.withDefaultNamespace("killed")) \|\| holder.is(Identifier.withDefaultNamespace("killed_by"))) {`
`52`	`51`	`return new PaperStatisticType<>(`
`53`		`- (Holder<StatType<net.minecraft.world.entity.EntityType<?>>>) (Holder<?>) holder,`
	`52`	`+ (Holder<StatType<net.minecraft.world.entity.EntityType<?>>>) holder,`
`54`	`53`	`t -> t != EntityType.UNKNOWN,`
`55`	`54`	`CraftEntityType::bukkitToMinecraft,`
`56`	`55`	`(entityType, ignored) -> CraftEntityType.minecraftToBukkit(entityType)`
`57`	`56`	`);`
`58`	`57`	`} else {`
`59`		`- return new PaperStatisticType<>((Holder<StatType<M>>) (Holder<?>) holder);`
	`58`	`+ return new PaperStatisticType<>((Holder<StatType<M>>) holder);`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`
`63`		`- public static <A, M> StatisticType<A> minecraftToBukkit(final StatType<M> minecraft) {`
	`62`	`+ public static <S extends Keyed, M> PaperStatisticType<S, M> minecraftToBukkit(final StatType<M> minecraft) {`
`64`	`63`	`return CraftRegistry.minecraftToBukkit(minecraft, Registries.STAT_TYPE);`
`65`	`64`	`}`
`66`	`65`
`67`		`- public static <A, M> StatType<M> bukkitToMinecraft(final StatisticType<A> bukkit) {`
	`66`	`+ public static <S, M> StatType<M> bukkitToMinecraft(final StatisticType<S> bukkit) {`
`68`	`67`	`return CraftRegistry.bukkitToMinecraft(bukkit);`
`69`	`68`	`}`
`70`	`69`
`@@ -79,9 +78,9 @@ public Statistic<S> forValue(final S value) {`
`79`	`78`	`}`
`80`	`79`	`return this.statCacheMap.computeIfAbsent(`
`81`	`80`	`value, newValue -> {`
`82`		`- final M nmsValue = this.bukkitToMinecraft.apply(value);`
	`81`	`+ final M nmsValue = this.bukkitToMinecraft.apply(newValue);`
`83`	`82`	`final Stat<M> nmsStat = this.getHandle().get(nmsValue);`
`84`		`- return new PaperStatistic<>(nmsStat, value, nmsValue, this);`
	`83`	`+ return new PaperStatistic<>(nmsStat, newValue, nmsValue, this);`
`85`	`84`	`}`
`86`	`85`	`);`
`87`	`86`	`}`
`@@ -93,7 +92,7 @@ public RegistryKey<S> registryKey() {`
`93`	`92`
`94`	`93`	`@Override`
`95`	`94`	`public String translationKey() {`
`96`		`- Preconditions.checkArgument(this != StatisticTypes.CUSTOM, this.key() + " does not have a translation key, see CustomStatistic#translationKey()");`
	`95`	`+ Preconditions.checkArgument(this != StatisticTypes.CUSTOM, this.getKey() + " does not have a translation key, see CustomStatistic#translationKey()");`
`97`	`96`	`return "stat_type." + this.getKey().toString().replace(':', '.');`
`98`	`97`	`}`
`99`	`98`	`}`