Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

refactor: rebase onto master

Browse Source
This commit is contained in:
Boy 2024-11-02 17:33:25 +01:00
parent 5ef754fa05
commit 5a4d485e69
2 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/api/0483-Vault-API.patch → patches/api/0496-Vault-API.patch
View File

@ -72,24 +72,3 @@ index 375f41fe4aebdbf140497b5ba1e54e1c72f0cdfc..ace0652cdba2431aa4d622d2d7ef23dd
+ void setItemsToEject(List<ItemStack> itemsToEject);
+ // Paper end - Vault API
}
diff --git a/src/main/java/org/bukkit/block/data/type/Vault.java b/src/main/java/org/bukkit/block/data/type/Vault.java
index 87e46dfb951b6e4b753af7c31efd444e549052b9..9a8ee2bcd1b3bd89d11aab87bb5153f0d8e88458 100644
--- a/src/main/java/org/bukkit/block/data/type/Vault.java
+++ b/src/main/java/org/bukkit/block/data/type/Vault.java
@@ -16,14 +16,14 @@ public interface Vault extends Directional {
* @return the 'vault_state' value
*/
@NotNull
- State getTrialSpawnerState();
+ State getVaultState(); // Paper
/**
* Sets the value of the 'vault_state' property.
*
* @param state the new 'vault_state' value
*/
- void setTrialSpawnerState(@NotNull State state);
+ void setVaultState(@NotNull State state); // Paper
/**
* Gets the value of the 'ominous' property.

38
patches/server/1045-Vault-API.patch → patches/server/1060-Vault-API.patch
View File

@ -235,41 +235,3 @@ index bfee498287c8358cbc8c9c2b7289d861cb90f0ad..d6fecfee5ce3245e6ae4b2cfd05083ad
@Override
public CraftVault copy() {
return new CraftVault(this, null);
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java
index 5a5f60ba2c6b6ad29693daf75eaab83ac6c1b816..808d3ae5270e5bfe73dd163fd1150b0ab470f643 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java
@@ -9,12 +9,12 @@ public abstract class CraftVault extends CraftBlockData implements Vault {
private static final net.minecraft.world.level.block.state.properties.BooleanProperty OMINOUS = getBoolean("ominous");
@Override
- public org.bukkit.block.data.type.Vault.State getTrialSpawnerState() {
+ public org.bukkit.block.data.type.Vault.State getVaultState() { // Paper
return this.get(CraftVault.VAULT_STATE, org.bukkit.block.data.type.Vault.State.class);
}
@Override
- public void setTrialSpawnerState(org.bukkit.block.data.type.Vault.State state) {
+ public void setVaultState(org.bukkit.block.data.type.Vault.State state) { // Paper
this.set(CraftVault.VAULT_STATE, state);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java
index 4c62caba7dff6538309cac46861fed047223bb5f..3db5ca6fe3d54cfd6285ee57bd242e72a2ec0c3a 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java
@@ -19,12 +19,12 @@ public final class CraftVault extends org.bukkit.craftbukkit.block.data.CraftBlo
private static final net.minecraft.world.level.block.state.properties.BooleanProperty OMINOUS = getBoolean(net.minecraft.world.level.block.VaultBlock.class, "ominous");
@Override
- public org.bukkit.block.data.type.Vault.State getTrialSpawnerState() {
+ public org.bukkit.block.data.type.Vault.State getVaultState() { // Paper
return this.get(CraftVault.VAULT_STATE, org.bukkit.block.data.type.Vault.State.class);
}
@Override
- public void setTrialSpawnerState(org.bukkit.block.data.type.Vault.State state) {
+ public void setVaultState(org.bukkit.block.data.type.Vault.State state) { // Paper
this.set(CraftVault.VAULT_STATE, state);
}