mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-19 17:58:15 +02:00
apply all paper api patches
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/Material.java
|
--- a/src/main/java/org/bukkit/Material.java
|
||||||
+++ b/src/main/java/org/bukkit/Material.java
|
+++ b/src/main/java/org/bukkit/Material.java
|
||||||
@@ -3703,4 +_,40 @@
|
@@ -3705,4 +_,40 @@
|
||||||
return this.asItemType().getDefaultDataTypes();
|
return this.asItemType().getDefaultDataTypes();
|
||||||
}
|
}
|
||||||
// Paper end - data component API
|
// Paper end - data component API
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/World.java
|
--- a/src/main/java/org/bukkit/World.java
|
||||||
+++ b/src/main/java/org/bukkit/World.java
|
+++ b/src/main/java/org/bukkit/World.java
|
||||||
@@ -4465,6 +_,100 @@
|
@@ -4468,6 +_,100 @@
|
||||||
@Nullable
|
@Nullable
|
||||||
public DragonBattle getEnderDragonBattle();
|
public DragonBattle getEnderDragonBattle();
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -4012,4 +_,123 @@
|
@@ -4011,4 +_,123 @@
|
||||||
*/
|
*/
|
||||||
@ApiStatus.Experimental
|
@ApiStatus.Experimental
|
||||||
PlayerGameConnection getConnection();
|
PlayerGameConnection getConnection();
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/entity/Villager.java
|
--- a/src/main/java/org/bukkit/entity/Villager.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
||||||
@@ -409,4 +_,13 @@
|
@@ -406,4 +_,13 @@
|
||||||
* Demand is still updated even if all events are canceled.
|
* Demand is still updated even if all events are canceled.
|
||||||
*/
|
*/
|
||||||
public void restock();
|
public void restock();
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
--- a/src/main/java/org/bukkit/entity/Wolf.java
|
--- a/src/main/java/org/bukkit/entity/Wolf.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Wolf.java
|
+++ b/src/main/java/org/bukkit/entity/Wolf.java
|
||||||
@@ -163,4 +_,20 @@
|
@@ -104,6 +_,22 @@
|
||||||
return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));
|
*/
|
||||||
}
|
void setSoundVariant(@NotNull SoundVariant soundVariant);
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // Purpur start
|
+ // Purpur start
|
||||||
+ /**
|
+ /**
|
||||||
+ * Checks if this wolf is rabid
|
+ * Checks if this wolf is rabid
|
||||||
@@ -20,4 +19,7 @@
|
|||||||
+ */
|
+ */
|
||||||
+ void setRabid(boolean rabid);
|
+ void setRabid(boolean rabid);
|
||||||
+ // Purpur end
|
+ // Purpur end
|
||||||
}
|
+
|
||||||
|
/**
|
||||||
|
* Represents the variant of a wolf.
|
||||||
|
*/
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||||
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||||
@@ -69,6 +_,7 @@
|
@@ -68,6 +_,7 @@
|
||||||
session.setTransferListener(new AbstractTransferListener() {
|
session.setTransferListener(new AbstractTransferListener() {
|
||||||
@Override
|
@Override
|
||||||
public void transferStarted(@NotNull TransferEvent event) {
|
public void transferStarted(@NotNull TransferEvent event) {
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
|
logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -94,6 +_,7 @@
|
@@ -93,6 +_,7 @@
|
||||||
// Paper end - plugin loader api
|
// Paper end - plugin loader api
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
||||||
{
|
{
|
||||||
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
||||||
@@ -146,6 +_,7 @@
|
@@ -142,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
jarFiles.add(url);
|
jarFiles.add(url);
|
||||||
|
|||||||
Reference in New Issue
Block a user