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

fix a mis-applied hunk in Projectile

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-15 12:09:18 -08:00
parent 8cca65b8ac
commit de10a277e2
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch
View File

@@ -139,7 +139,7 @@
Executor dispatcher, Executor dispatcher,
LevelStorageSource.LevelStorageAccess levelStorageAccess, LevelStorageSource.LevelStorageAccess levelStorageAccess,
- ServerLevelData serverLevelData, - ServerLevelData serverLevelData,
+ PrimaryLevelData serverLevelData, // CraftBukkit + net.minecraft.world.level.storage.PrimaryLevelData serverLevelData, // CraftBukkit
ResourceKey<Level> dimension, ResourceKey<Level> dimension,
LevelStem levelStem, LevelStem levelStem,
ChunkProgressListener progressListener, ChunkProgressListener progressListener,

26
paper-server/patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
View File

@@ -78,30 +78,20 @@
factory.create(level, owner, spawnedFrom), factory.create(level, owner, spawnedFrom),
level, level,
spawnedFrom, spawnedFrom,
@@ -200,7 +_,22 @@ @@ -206,7 +_,12 @@
float velocity, public static <T extends Projectile> T spawnProjectileUsingShoot(
float inaccuracy T projectile, ServerLevel level, ItemStack spawnedFrom, double x, double y, double z, float velocity, float inaccuracy
) { ) {
- return spawnProjectile(factory.create(level, owner, spawnedFrom), level, spawnedFrom, projectile -> projectile.shoot(x, y, z, velocity, inaccuracy)); - return spawnProjectile(projectile, level, spawnedFrom, projectile1 -> projectile.shoot(x, y, z, velocity, inaccuracy));
+ // Paper start - fixes and addition to spawn reason API + // Paper start - fixes and addition to spawn reason API
+ return Projectile.spawnProjectileUsingShootDelayed(factory, level, spawnedFrom, owner, x, y, z, velocity, inaccuracy).spawn(); + return spawnProjectileUsingShootDelayed(projectile, level, spawnedFrom, x, y, z, velocity, inaccuracy).spawn();
+ } + }
+ public static <T extends Projectile> Delayed<T> spawnProjectileUsingShootDelayed( + public static <T extends Projectile> Delayed<T> spawnProjectileUsingShootDelayed(T projectile, ServerLevel level, ItemStack spawnedFrom, double x, double y, double z, float velocity, float inaccuracy) {
+ Projectile.ProjectileFactory<T> factory, + return spawnProjectileDelayed(projectile, level, spawnedFrom, projectile1 -> projectile.shoot(x, y, z, velocity, inaccuracy));
+ ServerLevel level,
+ ItemStack spawnedFrom,
+ LivingEntity owner,
+ double x,
+ double y,
+ double z,
+ float velocity,
+ float inaccuracy
+ ) {
+ return spawnProjectileDelayed(factory.create(level, owner, spawnedFrom), level, spawnedFrom, projectile -> projectile.shoot(x, y, z, velocity, inaccuracy));
+ // Paper end - fixes and addition to spawn reason API + // Paper end - fixes and addition to spawn reason API
} }
public static <T extends Projectile> T spawnProjectileUsingShoot( public static <T extends Projectile> T spawnProjectile(T projectile, ServerLevel level, ItemStack spawnedFrom) {
@@ -214,11 +_,45 @@ @@ -214,11 +_,45 @@
} }