mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-28 19:39:17 +00:00
Updated Upstream (Gale)
This commit is contained in:
2
.github/workflows/auto-update.yml
vendored
2
.github/workflows/auto-update.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
||||
if ! git diff --quiet; then
|
||||
echo "Running tests...."
|
||||
./gradlew applyPatches
|
||||
./gradlew createReobfPaperclipJar
|
||||
./gradlew createMojmapPaperclipJar
|
||||
fi
|
||||
|
||||
- name: Check for changes and write to repository
|
||||
|
||||
@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
|
||||
mcVersion = 1.21
|
||||
version = 1.21-R0.1-SNAPSHOT
|
||||
|
||||
galeCommit = 6e3b9bdf5b1b6f233c4c311730b460ba794e9ac2
|
||||
galeCommit = cb3e413cba19462a9182e2404fec86f494da8b8b
|
||||
|
||||
org.gradle.caching = true
|
||||
org.gradle.parallel = true
|
||||
|
||||
@@ -12711,10 +12711,10 @@ index 1aa5e57a4e6a4be60514d8808a2e6c973d93e798..334fa781e94d195c13dd78cdbe8f43b4
|
||||
}
|
||||
} else {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
|
||||
index cb71f468e90f076caf2c0dcc5f2ba2745c737c22..c8dbca9573060f7d9c2a0a96a532f06d3c17728f 100644
|
||||
index 44c733c5b2c3e9942f28e882ad72306a24459c2c..bebaa347ddcc9f54f888fa1bc20a77c6a64c90e3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
|
||||
@@ -68,7 +68,7 @@ public class ThrownTrident extends AbstractArrow {
|
||||
@@ -69,7 +69,7 @@ public class ThrownTrident extends AbstractArrow {
|
||||
Entity entity = this.getOwner();
|
||||
byte b0 = (Byte) this.entityData.get(ThrownTrident.ID_LOYALTY);
|
||||
|
||||
@@ -17014,7 +17014,7 @@ index 8045d6c9398d1c88595da6e41aa1ed27fb6fbad0..0056843aabf3a46251eda8667ddb43da
|
||||
public Collection<GeneratedStructure> getStructures(int x, int z) {
|
||||
return this.getStructures(x, z, struct -> true);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 51ae7262189a1b7d0170d7887361c3468bc2391c..bbe8cd960f9f1e65bc3304ca27befae420bb5677 100644
|
||||
index f4106b117c2b82a25616b590e7b0853f05864ea1..f86093a51495a736e8c82afc9fee08e91e1fb697 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -197,6 +197,14 @@ public class Main {
|
||||
@@ -17340,7 +17340,7 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..5c1cda88080850314dac196dbe71ff12
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
index a1e715629313346f670bce92483996122b0f1d7b..db9962ef89829bb14d84cc8495117ff4509c01cf 100644
|
||||
index b3970222ed979dda5296ce472739c112b70d0e89..1504c8b0a36e1af7548b3b442e280e7c853e8028 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -513,7 +513,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
@@ -17352,7 +17352,7 @@ index a1e715629313346f670bce92483996122b0f1d7b..db9962ef89829bb14d84cc8495117ff4
|
||||
}
|
||||
// Paper end
|
||||
|
||||
@@ -1181,4 +1181,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
@@ -1182,4 +1182,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
this.getHandle().setYBodyRot(bodyYaw);
|
||||
}
|
||||
// Paper end - body yaw API
|
||||
|
||||
Reference in New Issue
Block a user