pastefile1
Applying: Only write chunk data to disk if it serializes without throwing
Applying: Fix tripwire state inconsistency
Applying: Fix fluid-logging on Block#breakNaturally
Applying: Forward CraftEntity in teleport command
Using index info to reconstruct a base tree...
M src/main/java/net/minecraft/world/entity/Entity.java
Falling back to patching base and 3-way merge...
Auto-merging src/main/java/net/minecraft/world/entity/Entity.java
CONFLICT (content): Merge conflict in src/main/java/net/minecraft/world/entity/Entity.java
Patch failed at 0805 Forward CraftEntity in teleport command
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
*** Please review above details and finish the apply then
*** save the changes with `./gradlew rebuildPatches`
> Task :applyServerPatches FAILED
FAILURE: Build failed with an exception.
* What went wrong:
Execution failed for task ':applyServerPatches'.
> io.papermc.paperweight.PaperweightException: Failed to apply patches
* Try:
> Run with --stacktrace option to get the stack trace.
> Run with --info or --debug option to get more log output.
> Run with --scan to get full insights.
* Get more help at https://help.gradle.org
BUILD FAILED in 9s
36 actionable tasks: 4 executed, 32 up-to-date