OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correct javadocs on PlayerArmorStandManipulateEvent (#7719)

Browse source
This commit is contained in:
Jake Potrebic 2022-09-22 22:55:02 -07:00
parent 2277da6ec5
commit d885450b81
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,6 +187,41 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
*/
EATING,
/**
diff --git a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
@@ -0,0 +0,0 @@ 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.
*/
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/EntityEquipment.java