twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.15.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2020-01-22 08:00:00 +11:00
parent 35e62b85bf
commit eb35e8f1d1
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-api/src/main/java/org/bukkit/GameRule.java
View File

@@ -148,6 +148,16 @@ public final class GameRule<T> {
*/
public static final GameRule<Boolean> FIRE_DAMAGE = new GameRule<>("fireDamage", Boolean.class);
/**
* Whether patrols should naturally spawn.
*/
public static final GameRule<Boolean> DO_PATROL_SPAWNING = new GameRule<>("doPatrolSpawning", Boolean.class);
/**
* Whether traders should naturally spawn.
*/
public static final GameRule<Boolean> DO_TRADER_SPAWNING = new GameRule<>("doTraderSpawning", Boolean.class);
// Numerical rules
/**
* How often a random block tick occurs (such as plant growth, leaf decay,

24
paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
View File

@@ -16,7 +16,11 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* Represents a stack of items
* Represents a stack of items.
* <p>
* <b>IMPORTANT: An <i>Item</i>Stack is only designed to contain <i>items</i>. Do not
* use this class to encapsulate Materials for which {@link Material#isItem()}
* returns false.</b>
*/
public class ItemStack implements Cloneable, ConfigurationSerializable {
private Material type = Material.AIR;
@@ -28,7 +32,11 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
protected ItemStack() {}
/**
* Defaults stack size to 1, with no extra data
* Defaults stack size to 1, with no extra data.
* <p>
* <b>IMPORTANT: An <i>Item</i>Stack is only designed to contain
* <i>items</i>. Do not use this class to encapsulate Materials for which
* {@link Material#isItem()} returns false.</b>
*
* @param type item material
*/
@@ -37,7 +45,11 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
}
/**
* An item stack with no extra data
* An item stack with no extra data.
* <p>
* <b>IMPORTANT: An <i>Item</i>Stack is only designed to contain
* <i>items</i>. Do not use this class to encapsulate Materials for which
* {@link Material#isItem()} returns false.</b>
*
* @param type item material
* @param amount stack size
@@ -109,7 +121,11 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
/**
* Sets the type of this item
* <p>
* Note that in doing so you will reset the MaterialData for this stack
* Note that in doing so you will reset the MaterialData for this stack.
* <p>
* <b>IMPORTANT: An <i>Item</i>Stack is only designed to contain
* <i>items</i>. Do not use this class to encapsulate Materials for which
* {@link Material#isItem()} returns false.</b>
*
* @param type New type to set the items in this stack to
*/