9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00

fix conflicts

This commit is contained in:
NONPLAYT
2024-03-01 00:12:11 +03:00
parent db913a4709
commit 847f4b3de7
13 changed files with 49 additions and 49 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Don't save Fireworks
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
index 7005b3a26e9b5d79064981a4a41bee21b65a9fc3..1dfe386460d1de7034b4e9416b120f07875261bb 100644
index 5b3b59057b962438c6f4fc8a1507342865b3bc11..f09388fa1fb3a84da4678ea46761a55872a03cc8 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
@@ -352,4 +352,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
@@ -355,4 +355,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
public boolean isAttackable() {
return false;
}