Update upstream

This commit is contained in:
Cryptite
2023-06-03 07:39:42 -05:00
parent 4ddd0748f3
commit 5dc2168275
8 changed files with 18 additions and 18 deletions

View File

@@ -18,10 +18,10 @@ index a87f6380b2c387fb0cdd40d5087b5c93492e3c88..cd35c2136a638c07fed683a2f92e70aa
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 35c52b34a0c4a1b99ea5096d12897c4ab2c485a8..28dc8b5d39297b0077484b1b7d55b1e3002d95e7 100644
index 53f33b19277cdfd364b84362475a72f8d1a3cd60..66bcacfafe25f2543d40eb959ef251da400a2c73 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -435,6 +435,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -436,6 +436,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
* Overriding this field will cause memory leaks.
*/
private final boolean hardCollides;