mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
c71bb9ca Add PlayerRecipeDiscoverEvent and methods to (un/)discover recipes

CraftBukkit Changes:
7a2f4867 Implement PlayerRecipeDiscoverEvent and methods to (un/)discover recipes
This commit is contained in:
Shane Freeder 2018-10-02 11:01:56 +01:00
parent eaa2c39183
commit 9038677c89
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
18 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
View file

@ -1,14 +1,14 @@
From cde8228c35b12307dc50eb03eb3550aa2f41c485 Mon Sep 17 00:00:00 2001
From 4fc8923239da47d511fbb1e243105c0144a99bee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:04:51 -0400
Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 518aa2a9..3939d4af 100644
index 144e432cd..d137d6bf2 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -256,6 +256,24 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
@@ -258,6 +258,24 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
*/
public int getExpToLevel();
@ -31,8 +31,8 @@ index 518aa2a9..3939d4af 100644
+ // Paper end
+
/**
* Gets the entity currently perched on the left shoulder or null if no
* entity.
* Discover a recipe for this player such that it has not already been
* discovered. This method will add the key's associated recipe to the
--
2.18.0
2.19.0

8
Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
View file

@ -1,14 +1,14 @@
From b8fbba03fc7abd8c77f063e41fc16537c4117102 Mon Sep 17 00:00:00 2001
From bb4320c8362db25900dd40bdcbe30d2d2b9500f0 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 1 Apr 2018 02:28:43 +0300
Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 3939d4af..dd95773e 100644
index d137d6bf2..3590149a8 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -335,4 +335,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
@@ -388,4 +388,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
*/
@Deprecated
public void setShoulderEntityRight(Entity entity);
@ -23,5 +23,5 @@ index 3939d4af..dd95773e 100644
+ // Paper end
}
--
2.18.0
2.19.0

8
Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
View file

@ -1,4 +1,4 @@
From 620b05a03d9f8250536ca98235324946057337f5 Mon Sep 17 00:00:00 2001
From c0fe423e87026d3311fa8cfb5cd1e07e97c420b3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:52:52 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index dd95773e2..8fe01e47e 100644
index 3590149a8..972c8f970 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -137,6 +137,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
@@ -139,6 +139,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
*/
public void closeInventory();
@ -90,5 +90,5 @@ index 19889b278..e6e45b936 100644
/**
--
2.18.0
2.19.0