Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear 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:
c7c11188 SPIGOT-2620: Add Player#sendBlockChanges()
f63d2b44 Improve annotation test on parameters
3372e7b4 SPIGOT-1244, SPIGOT-6860, SPIGOT-6874: Various Javadoc and formatting fixes
a1e8a9ab PR-793: Ignore .checkstyle file generated by Eclipse IDE

CraftBukkit Changes:
c2c39089e SPIGOT-2620: Add Player#sendBlockChanges()
8209158db PR-1113: Ignore .checkstyle file generated by Eclipse IDE

Spigot Changes:
4aa5ead2 Rebuild patches
This commit is contained in:
Shane Freeder 2022-09-24 02:38:12 +01:00
parent f528f53e81
commit 3996e6ef29
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
73 changed files with 247 additions and 290 deletions

View file

@ -106,7 +106,7 @@ index 652238659e0a6e0df11f2798773aea4fe7712360..9c57eda3b7af7026639afda9959bc5e5
* Returns the name of this player
*
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index 6f117995c3ccf9182946c01a663cd8bef1804eb3..00266bf81b022a0f4b4f71061b82a8713b773320 100644
index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..4f63988848443aff55619bc12ef12c925642a3f9 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -9,6 +9,10 @@ import org.jetbrains.annotations.Nullable;
@ -121,10 +121,10 @@ index 6f117995c3ccf9182946c01a663cd8bef1804eb3..00266bf81b022a0f4b4f71061b82a871
* Instructs this Mob to set the specified LivingEntity as its target.
* <p>
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 17c56b7d4dcac0738078101203fbef1716ed3157..f9ecac9a2c45e1d428277e43f9cf1a93a53dd84f 100644
index 80910fcc46b62ee4974a659713a1a72b5b4c135b..50faa513411cdb611ae228f0c07a7dfe15807b85 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -310,15 +310,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -312,15 +312,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Saves the players current location, health, inventory, motion, and
@ -144,7 +144,7 @@ index 17c56b7d4dcac0738078101203fbef1716ed3157..f9ecac9a2c45e1d428277e43f9cf1a93
* <p>
* Note: This will overwrite the players current inventory, health,
* motion, etc, with the state from the saved dat file.
@@ -774,7 +774,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -798,7 +798,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* Use supplied alternative character to the section symbol to represent legacy color codes.
*
@ -187,41 +187,6 @@ index d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a..7ecff9fcee19fc94be784474fea620e5
*/
EATING,
/**
diff --git a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
index f72dd3ccf09c024213548e59ee1c13ca2cf48808..2f54cb77c991211e0e4b9fa37dc64888804a2a07 100644
--- a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
@@ -26,11 +26,11 @@ public class PlayerArmorStandManipulateEvent extends PlayerInteractEntityEvent {
}
/**
- * Returns the item held by the player. If this Item is null and the armor stand Item is also null,
+ * Returns the item held by the player. If this Item is air and the armor stand Item is also air,
* there will be no transaction between the player and the armor stand.
- * If the Player's item is null, but the armor stand item is not then the player will obtain the armor stand item.
- * In the case that the Player's item is not null, but the armor stand item is null, the players item will be placed on the armor stand.
- * If both items are not null, the items will be swapped.
+ * If the Player's item is air, but the armor stand item is not then the player will obtain the armor stand item.
+ * In the case that the Player's item is not air, but the armor stand item is air, the players item will be placed on the armor stand.
+ * If both items are not air, the items will be swapped.
* In the case that the event is cancelled the original items will remain the same.
* @return the item held by the player.
*/
@@ -41,10 +41,10 @@ public class PlayerArmorStandManipulateEvent extends PlayerInteractEntityEvent {
/**
* Returns the item held by the armor stand.
- * If this Item is null and the player's Item is also null, there will be no transaction between the player and the armor stand.
- * If the Player's item is null, but the armor stand item is not then the player will obtain the armor stand item.
- * In the case that the Player's item is not null, but the armor stand item is null, the players item will be placed on the armor stand.
- * If both items are not null, the items will be swapped.
+ * If this Item is air and the player's Item is also air, there will be no transaction between the player and the armor stand.
+ * If the Player's item is air, but the armor stand item is not then the player will obtain the armor stand item.
+ * In the case that the Player's item is not air, but the armor stand item is air, the players item will be placed on the armor stand.
+ * If both items are not air, the items will be swapped.
* In the case that the event is cancelled the original items will remain the same.
* @return the item held by the armor stand.
*/
diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
index d5b50a4a954fed35d37f03f1a277cc173ca106df..a91fa5386afd7a1137adb921ad5adb798604772f 100644
--- a/src/main/java/org/bukkit/inventory/EntityEquipment.java