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

Correct javadocs on PlayerArmorStandManipulateEvent (#7719)

Browse source
This commit is contained in:
Jake Potrebic 2022-09-22 22:55:02 -07:00 • committed by GitHub
parent ec0c550482
commit f528f53e81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 51 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
patches/api/0054-Fix-upstream-javadocs.patch
View file

@ -187,6 +187,41 @@ 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