@@ -0,0 +1,28 @@
|
||||
--- a/net/minecraft/server/RecipeBookServer.java
|
||||
+++ b/net/minecraft/server/RecipeBookServer.java
|
||||
@@ -10,6 +10,8 @@
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
||||
+
|
||||
public class RecipeBookServer extends RecipeBook {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
@@ -25,7 +27,7 @@
|
||||
IRecipe<?> irecipe = (IRecipe) iterator.next();
|
||||
MinecraftKey minecraftkey = irecipe.getKey();
|
||||
|
||||
- if (!this.recipes.contains(minecraftkey) && !irecipe.isComplex()) {
|
||||
+ if (!this.recipes.contains(minecraftkey) && !irecipe.isComplex() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, minecraftkey)) { // CraftBukkit
|
||||
this.a(minecraftkey);
|
||||
this.d(minecraftkey);
|
||||
list.add(minecraftkey);
|
||||
@@ -59,6 +61,7 @@
|
||||
}
|
||||
|
||||
private void a(PacketPlayOutRecipes.Action packetplayoutrecipes_action, EntityPlayer entityplayer, List<MinecraftKey> list) {
|
||||
+ if (entityplayer.playerConnection == null) return; // SPIGOT-4478 during PlayerLoginEvent
|
||||
entityplayer.playerConnection.sendPacket(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.a()));
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
--- a/net/minecraft/server/StatisticManager.java
|
||||
+++ b/net/minecraft/server/StatisticManager.java
|
||||
@@ -15,6 +15,12 @@
|
||||
public void b(EntityHuman entityhuman, Statistic<?> statistic, int i) {
|
||||
int j = (int) Math.min((long) this.getStatisticValue(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);
|
||||
+ if (cancellable != null && cancellable.isCancelled()) {
|
||||
+ return;
|
||||
+ }
|
||||
+ // CraftBukkit end
|
||||
this.setStatistic(entityhuman, statistic, j);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user