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@4d44b5fd Remove @Experimental annotation from the org.bukkit.damage package (#12898) PaperMC/Paper@4f79e9ee [ci/skip] no need to ever import non-library files ever again (#12765) PaperMC/Paper@a4da45e3 Fix typo in give command (#12905) PaperMC/Paper@ec9c83fa Adventure 4.24.0 (#12908) PaperMC/Paper@0c8efe4d [ci/skip] Remove redundant adventure version specification PaperMC/Paper@ed31825a HIDE_ADDITIONAL_TOOLTIP backwards compat. not hiding disc names (#12900)
This commit is contained in:
@@ -5,10 +5,4 @@
|
||||
# authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
||||
# datafixerupper com.mojang.datafixers.DataFixerBuilder
|
||||
# datafixerupper com/mojang/datafixers/util/Either.java
|
||||
# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
|
||||
# minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
|
||||
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
|
||||
# To import minecraft data files, like the default chat type, use `mc_data` as the prefix:
|
||||
# mc_data chat_type/chat.json
|
||||
# mc_data dimension_type/overworld.json
|
||||
#
|
||||
|
||||
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
||||
version = 1.21.8-R0.1-SNAPSHOT
|
||||
|
||||
mcVersion = 1.21.8
|
||||
paperCommit = dbc367ba2d696fec2433b15ed23a893a34895638
|
||||
paperCommit = ed31825a8d9d4016a1fcd4c10b24926b51ced4cc
|
||||
|
||||
org.gradle.configuration-cache = true
|
||||
org.gradle.caching = true
|
||||
|
||||
@@ -29,10 +29,10 @@ index edc1758f12b36555edb7eaba2ea3bd78118dda93..7a9e20699a8a5e95910ed15eb6cd1192
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 2b17b3b51bd4ccd431e7cc959cc42795dfb2c1b8..54fbe5006c2c240937efb6fc89cf08b72637b9e5 100644
|
||||
index eb53bc8c56c9b7dcfa051da06e9ffbe837978dac..4e24a177aed7eda0899b4a1a1e308f02a16c5718 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1459,6 +1459,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
|
||||
@@ -1460,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
|
||||
// Paper start - Teleport passenger API
|
||||
// Don't allow teleporting between worlds while keeping passengers
|
||||
if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
|
||||
@@ -40,7 +40,7 @@ index 2b17b3b51bd4ccd431e7cc959cc42795dfb2c1b8..54fbe5006c2c240937efb6fc89cf08b7
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1480,6 +1481,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
|
||||
@@ -1481,6 +1482,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
|
||||
}
|
||||
|
||||
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -564,10 +_,15 @@
|
||||
@@ -565,10 +_,15 @@
|
||||
|
||||
@Override
|
||||
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
|
||||
for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
|
||||
if (player.getBukkitEntity().canSee(this)) {
|
||||
@@ -1008,6 +_,78 @@
|
||||
@@ -1009,6 +_,78 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
@Override
|
||||
public void sendBlockDamage(Location loc, float progress) {
|
||||
this.sendBlockDamage(loc, progress, this.getEntityId());
|
||||
@@ -2664,6 +_,28 @@
|
||||
@@ -2671,6 +_,28 @@
|
||||
public float getWalkSpeed() {
|
||||
return this.getHandle().getAbilities().walkingSpeed * 2f;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user