9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00

Updated Upstream (Paper)

This commit is contained in:
Dreeam
2024-06-17 07:42:31 +08:00
parent e671167ace
commit c38aecb7c8
9 changed files with 48 additions and 48 deletions

View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761a8edd2c8 100644
index 07a3f5bc00fdb932831b579f4a189eddefe328f8..6fd31b9566d6583ed30a73a6a36bf19b7fa64a60 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4286,16 +4286,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4275,16 +4275,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4303,14 +4305,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4292,14 +4294,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -128,7 +128,7 @@ index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4332,9 +4381,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4321,9 +4370,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
}
}