diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java index c523b01..aae84ae 100644 --- a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java +++ b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java @@ -820,6 +820,7 @@ { if (p_71064_1_ != null) { + if (p_71064_1_.isAchievement() && MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.AchievementEvent(this, (net.minecraft.stats.Achievement) p_71064_1_))) return; this.field_147103_bO.func_150871_b(this, p_71064_1_, p_71064_2_); Iterator iterator = this.getWorldScoreboard().func_96520_a(p_71064_1_.func_150952_k()).iterator(); diff --git a/src/main/java/net/minecraftforge/event/entity/player/AchievementEvent.java b/src/main/java/net/minecraftforge/event/entity/player/AchievementEvent.java new file mode 100644 index 0000000..7dff20d --- /dev/null +++ b/src/main/java/net/minecraftforge/event/entity/player/AchievementEvent.java @@ -0,0 +1,20 @@ +package net.minecraftforge.event.entity.player; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.stats.Achievement; +import cpw.mods.fml.common.eventhandler.Cancelable; +import cpw.mods.fml.common.eventhandler.Event; + +/** + * When the player receives an achievement. If canceled the player will not receive anything. + */ +@Cancelable +public class AchievementEvent extends PlayerEvent { + + public final Achievement achievement; + public AchievementEvent(EntityPlayer player, Achievement achievement) + { + super(player); + this.achievement = achievement; + } +} diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties index 69853c7..d83a147 100644 --- a/src/main/resources/fmlversion.properties +++ b/src/main/resources/fmlversion.properties @@ -1,6 +1,6 @@ fmlbuild.major.number=7 fmlbuild.minor.number=10 fmlbuild.revision.number=11 -fmlbuild.build.number=53 +fmlbuild.build.number=54 fmlbuild.mcversion=1.7.10 fmlbuild.mcpversion=9.05