9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-20 15:39:37 +00:00

Updated Upstream (Gale)

This commit is contained in:
Dreeam
2023-10-10 23:41:13 -04:00
parent 5884d931a0
commit cb51f2c3a0
3 changed files with 5 additions and 5 deletions

View File

@@ -1,7 +1,7 @@
group = org.dreeam.leaf group = org.dreeam.leaf
version = 1.20.2-R0.1-SNAPSHOT version = 1.20.2-R0.1-SNAPSHOT
galeCommit = 059cbce88f62a7685d1ca31788e1b903cc63e905 galeCommit = aad62370715e63ae83ac395a412d90439767765f
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

View File

@@ -17861,7 +17861,7 @@ index d657fd2c507a5b215aeab0a5f3e9c2ee892a27c8..985e9ec21c60a1f47973bd5fc53b96a6
// Paper start // Paper start
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 315d8260e196709ed9084272aa640f11e327c0a8..ee419545d9ddd1def10781f57b6f3dcbb802b9f2 100644 index f7ebddd35ff5a60a81034fd7de035ebba83e9517..eb409ecf5bf06692038e9fe84af986092a7d7837 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -223,6 +223,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -223,6 +223,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -17887,7 +17887,7 @@ index 315d8260e196709ed9084272aa640f11e327c0a8..ee419545d9ddd1def10781f57b6f3dcb
return false; return false;
} }
@@ -1523,4 +1532,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -1527,4 +1536,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return this.getHandle().getScoreboardName(); return this.getHandle().getScoreboardName();
} }
// Paper end - entity scoreboard name // Paper end - entity scoreboard name

View File

@@ -2041,7 +2041,7 @@ index 7a2f46579352870cfbb32c343d7c68919758ffe3..16676b8be6ad1614ee261edd6bf4c0f9
} }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 7f4e0a4bff74bcb56f455f3ea76bb1d96d71e1ad..e0d631c2e692fa61e252a418a5eebf78aa79617d 100644 index b451ac809c769fbb943e30553f4c521140dc2edd..6016fb99b17a241f048b9e13253aed7924c80c09 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -206,12 +206,6 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -206,12 +206,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -2057,7 +2057,7 @@ index 7f4e0a4bff74bcb56f455f3ea76bb1d96d71e1ad..e0d631c2e692fa61e252a418a5eebf78
public static byte toLegacyData(BlockState data) { public static byte toLegacyData(BlockState data) {
return CraftLegacy.toLegacyData(data); return CraftLegacy.toLegacyData(data);
@@ -445,10 +439,6 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -455,10 +449,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
} }
// Paper start // Paper start