Upstream & update Flare

TECHNOVE · Feb 28, 2022 · c253f34 · c253f34
1 parent 74774a0
commit c253f34
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 
 mcVersion = 1.17.1
 packageVersion = 1_17_1_R1
-paperRef = cc43ba70ff3107e5a044a5f7f37b7f5536058939
+paperRef = c53577e3c0ed48a3e5c728c9e8fac96312b1c6f1
 
 org.gradle.jvmargs=-Xmx2G
 

diff --git a/patches/server/0005-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0005-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -27,10 +27,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/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 465dab588e770bf4d1e645e1f451a066f388014a..0b787ae1fd72507560589d27ac901111e46814b0 100644
+index 7d2e106931f6d3eef5159eca9621bf158ee726c4..27709b866270374aee26c915d9c07309dbf46b18 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3444,7 +3444,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3466,7 +3466,10 @@ public abstract class LivingEntity extends Entity {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
 
              // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists

diff --git a/patches/server/0013-Airplane-Profiler.patch b/patches/server/0013-Airplane-Profiler.patch
@@ -20,14 +20,14 @@ 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/build.gradle.kts b/build.gradle.kts
-index 5a7947cf5ab437eb5d62f8c73796e837e134d6c3..a768d483d9bd90b8a6116c3890e2f5cde2363e49 100644
+index 6cf00a3764710b31c3c61134dfe1435e66d7a035..0517c09379f9893e5b6e2dc38027b28bacc287f0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -63,6 +63,7 @@ dependencies {
      implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.7.2") { // Airplane - more config
          exclude(group="org.yaml", module="snakeyaml") // exclude snakeyaml dependency because its old (1.26)
      } // Airplane - more config
-+    implementation("com.github.technove:Flare:2c4a2114a0") // Airplane - flare
++    implementation("com.github.technove:Flare:34637f3f87") // Airplane - flare
 
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")

diff --git a/patches/server/0018-Cache-climbing-check-for-activation.patch b/patches/server/0018-Cache-climbing-check-for-activation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache climbing check for activation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0b787ae1fd72507560589d27ac901111e46814b0..df12ba04df24e1c70c43e00283ea2a78ae2ca422 100644
+index 27709b866270374aee26c915d9c07309dbf46b18..25ec6788aac96691ab6241a56aadf87b765aa864 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -16,7 +16,7 @@ index 0b787ae1fd72507560589d27ac901111e46814b0..df12ba04df24e1c70c43e00283ea2a78
 
  public abstract class LivingEntity extends Entity {
 
-@@ -1828,6 +1827,20 @@ public abstract class LivingEntity extends Entity {
+@@ -1850,6 +1849,20 @@ public abstract class LivingEntity extends Entity {
          return this.lastClimbablePos;
      }
 

diff --git a/patches/server/0038-Sentry-Logging-Support.patch b/patches/server/0038-Sentry-Logging-Support.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Sentry Logging Support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a768d483d9bd90b8a6116c3890e2f5cde2363e49..889aa2d4fbdd85db00c6d711181cb1832fd9daa5 100644
+index 0517c09379f9893e5b6e2dc38027b28bacc287f0..a8d405700f885cd6eed9132d5c6f89754ab9f47e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -65,6 +65,8 @@ dependencies {
      } // Airplane - more config
-     implementation("com.github.technove:Flare:2c4a2114a0") // Airplane - flare
+     implementation("com.github.technove:Flare:34637f3f87") // Airplane - flare
 
 +    implementation("io.sentry:sentry:5.4.0") // Airplane
 +