2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/StatisticManager.java 2015-02-26 22:40:23.111608134 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/StatisticManager.java 2015-02-26 22:40:23.111608134 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -19,6 +19,12 @@
|
|
|
|
|
|
|
|
|
|
public void b(EntityHuman entityhuman, Statistic statistic, int i) {
|
|
|
|
|
if (!statistic.d() || this.b((Achievement) statistic)) {
|
|
|
|
|
+ // CraftBukkit start - fire Statistic events
|
|
|
|
|
+ org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(entityhuman, statistic, this.getStatisticValue(statistic), i);
|
|
|
|
|
+ if (cancellable != null && cancellable.isCancelled()) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
this.setStatistic(entityhuman, statistic, this.getStatisticValue(statistic) + i);
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -43,7 +49,7 @@
|
|
|
|
|
public <T extends IJsonStatistic> T b(Statistic statistic) {
|
|
|
|
|
StatisticWrapper statisticwrapper = (StatisticWrapper) this.a.get(statistic);
|
|
|
|
|
|
|
|
|
|
- return statisticwrapper != null ? statisticwrapper.b() : null;
|
|
|
|
|
+ return statisticwrapper != null ? (T) statisticwrapper.b() : null; // CraftBukkit - fix decompile error
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public <T extends IJsonStatistic> T a(Statistic statistic, T t0) {
|
