From 43e9be45865ce169740fbe503f6ae7d4481b84a1 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Thu, 8 Jul 2021 18:40:24 -0700 Subject: [PATCH] [ci skip] Remove extra newlines at EOF (#6127) --- patches/server/Add-hand-to-bucket-events.patch | 9 --------- patches/server/Fix-MC-187716-Use-configured-height.patch | 5 ----- patches/server/PreCreatureSpawnEvent.patch | 5 ----- ...le-NaN-health-absorb-values-and-repair-bad-data.patch | 5 ----- 4 files changed, 24 deletions(-) diff --git a/patches/server/Add-hand-to-bucket-events.patch b/patches/server/Add-hand-to-bucket-events.patch index 3e29e8b866..5756e86015 100644 --- a/patches/server/Add-hand-to-bucket-events.patch +++ b/patches/server/Add-hand-to-bucket-events.patch @@ -138,15 +138,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Override public boolean isClientSide() { return this.isClientSide; -diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java -+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -@@ -0,0 +0,0 @@ public final class NaturalSpawner { - void run(Mob entity, ChunkAccess chunk); - } - } -+ diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/patches/server/Fix-MC-187716-Use-configured-height.patch b/patches/server/Fix-MC-187716-Use-configured-height.patch index bae9244160..f9a68e23c6 100644 --- a/patches/server/Fix-MC-187716-Use-configured-height.patch +++ b/patches/server/Fix-MC-187716-Use-configured-height.patch @@ -17,11 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 mutableBlockPos.set(k, p, m); BlockState blockState4 = chunk.getBlockState(mutableBlockPos); if (blockState3.is(defaultBlock.getBlock()) && (blockState4.isAir() || blockState4 == defaultFluid)) { -@@ -0,0 +0,0 @@ public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder { entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot()); return entity1; -@@ -0,0 +0,0 @@ public abstract class BaseSpawner { - return this.oSpin; - } - } -+ diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java diff --git a/patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch index 8082a80e81..ab151138d8 100644 --- a/patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -43,11 +43,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 amount = 0.0F; } -@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity { - this.setDeltaMovement((double) ((float) packet.getXd() / 8000.0F), (double) ((float) packet.getYd() / 8000.0F), (double) ((float) packet.getZd() / 8000.0F)); - } - } -+ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java