mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix more compile errors

Browse source
This commit is contained in:
Jake Potrebic 2023-06-08 12:00:58 -07:00
commit 37e689f367
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
52 changed files with 88 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0904-Friction-API.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index cbe672e213b53b1939ba0dcb2e9640ec16d83807..7a6caded7f5c711e96fa0d6b177923c2a49004e4 100644
index b1565fc7458c72bb8db65ebbf7a069cb26c47ad4..7afd151aa40754d96846d5bd48acfc61f2c47c87 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@ -54,7 +54,7 @@ index cbe672e213b53b1939ba0dcb2e9640ec16d83807..7a6caded7f5c711e96fa0d6b177923c2
if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
this.getAttributes().load(nbt.getList("Attributes", 10));
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index 6ee24fbe6528f91306a0eb38b766f77b2228b4aa..d59841d65c76abd740e391cfdba09a0e167ec591 100644
index 00ecef0ba7530ff2533fa9d5eaa8489da8796ead..3d41dbe0285f8fec8adae1e93010cf464df9b08c 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -54,6 +54,7 @@ public class ItemEntity extends Entity implements TraceableEntity {