mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e5e2c50e Move scoreboard overrides to a separate field (#13378)
This commit is contained in:
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
|
|||||||
|
|
||||||
mcVersion = 1.21.11
|
mcVersion = 1.21.11
|
||||||
apiVersion=1.21.11
|
apiVersion=1.21.11
|
||||||
paperCommit = 4446f17f652d3ce56860f8c06d6746fa3c1853fc
|
paperCommit = e5e2c50ed3f7a6e4dbe7451c089cb1ad3f77f8f9
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -581,10 +_,15 @@
|
@@ -582,10 +_,15 @@
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerListName(String name) {
|
public void setPlayerListName(String name) {
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
|
if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
|
||||||
for (ServerPlayer player : this.server.getHandle().players) {
|
for (ServerPlayer player : this.server.getHandle().players) {
|
||||||
if (player.getBukkitEntity().canSee(this)) {
|
if (player.getBukkitEntity().canSee(this)) {
|
||||||
@@ -987,6 +_,80 @@
|
@@ -988,6 +_,80 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,7 +98,7 @@
|
|||||||
@Override
|
@Override
|
||||||
public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) {
|
public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) {
|
||||||
Preconditions.checkArgument(source != null, "source must not be null");
|
Preconditions.checkArgument(source != null, "source must not be null");
|
||||||
@@ -2494,6 +_,28 @@
|
@@ -2495,6 +_,28 @@
|
||||||
public float getWalkSpeed() {
|
public float getWalkSpeed() {
|
||||||
return this.getHandle().getAbilities().walkingSpeed * 2f;
|
return this.getHandle().getAbilities().walkingSpeed * 2f;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user