Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/stats/StatisticManager.java
+++ b/net/minecraft/stats/StatisticManager.java
@@ -16,6 +16,12 @@
public void b(EntityHuman entityhuman, Statistic<?> statistic, int i) {
int j = (int) Math.min((long) this.getStatisticValue(statistic) + (long) i, 2147483647L);
public void increment(EntityHuman entityhuman, Statistic<?> statistic, int i) {
int j = (int) Math.min((long) this.getValue(statistic) + (long) i, 2147483647L);
+ // CraftBukkit start - fire Statistic events
+ org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(entityhuman, statistic, this.getStatisticValue(statistic), j);
+ org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(entityhuman, statistic, this.getValue(statistic), j);
+ if (cancellable != null && cancellable.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
this.setStatistic(entityhuman, statistic, j);
this.setValue(entityhuman, statistic, j);
}