Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix wrong importation, code format and mistakes in contributing rules

This commit is contained in:
wyrdix 2023-04-27 18:18:40 +02:00
parent 4ef06a0101
commit 5882a0f187
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
patches/server/0975-Add-speed-argument-to-ProjectileSource-launchProject.patch
View File

@ -12,11 +12,9 @@ index d43859f8aa7beed82dd3a146bb1086982cd0cda7..e5eb4cdb69f761709ecf8a45183ba50f
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionType; import org.bukkit.potion.PotionType;
import org.bukkit.util.BlockIterator; import org.bukkit.util.BlockIterator;
+import org.bukkit.util.Consumer; +import org.bukkit.util.Consumer; //Paper
import org.bukkit.util.RayTraceResult; import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public class CraftLivingEntity extends CraftEntity implements LivingEntity { public class CraftLivingEntity extends CraftEntity implements LivingEntity {
private CraftEntityEquipment equipment; private CraftEntityEquipment equipment;
@ -29,12 +27,12 @@ index d43859f8aa7beed82dd3a146bb1086982cd0cda7..e5eb4cdb69f761709ecf8a45183ba50f
+ } + }
+ +
+ @Override + @Override
+ public <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, @Nullable Consumer<T> function) { + public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, Consumer<T> function) {
+ return this.launchProjectile(projectile, velocity, 1f, function); + return this.launchProjectile(projectile, velocity, 1f, function);
+ } + }
+ +
+ @Override + @Override
+ public <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, float speed) { + public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, float speed) {
+ // Paper start - initial speed + // Paper start - initial speed
+ return this.launchProjectile(projectile, velocity, speed, null); + return this.launchProjectile(projectile, velocity, speed, null);
} }
@ -43,8 +41,7 @@ index d43859f8aa7beed82dd3a146bb1086982cd0cda7..e5eb4cdb69f761709ecf8a45183ba50f
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
- public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, org.bukkit.util.Consumer<T> function) { - public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, org.bukkit.util.Consumer<T> function) {
+ public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, float speed, org.bukkit.util.Consumer<T> function) { + public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, float speed, org.bukkit.util.Consumer<T> function) {
// Paper end - launchProjectile consumer // Paper end - launchProjectile consumer & initial speed
+ // Paper end - initial speed
Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation"); Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle(); net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle();
@ -127,12 +124,12 @@ index 2afb7af0a90959edd3b0ead2fe4d9018b5560aa4..7f3ce96dbc158400ff23515d7c0ac026
@Override @Override
- public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, org.bukkit.util.Consumer<T> function) { - public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, org.bukkit.util.Consumer<T> function) {
+ public <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, @Nullable Consumer<T> function) { + public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, Consumer<T> function) {
+ return this.launchProjectile(projectile, velocity, 1f, null); + return this.launchProjectile(projectile, velocity, 1f, null);
+ } + }
+ +
+ @Override + @Override
+ public <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, float speed) { + public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, float speed) {
+ // Paper start - initial speed + // Paper start - initial speed
+ return this.launchProjectile(projectile, velocity, speed, null); + return this.launchProjectile(projectile, velocity, speed, null);
+ } + }
@ -147,7 +144,7 @@ index 2afb7af0a90959edd3b0ead2fe4d9018b5560aa4..7f3ce96dbc158400ff23515d7c0ac026
} }
// Copied from DispenseBehaviorProjectile // Copied from DispenseBehaviorProjectile
- ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b, a); - ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b, a);
+ ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b*speed, a); + ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b * speed, a);
} }
if (velocity != null) { if (velocity != null) {