Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Update Upstream (Folia)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Folia Changes :
PaperMC/Folia@e5b552f Properly synchronise RandomSequences access
PaperMC/Folia@a4d99b3 Update paperweight to 1.5.7
PaperMC/Folia@726cdc3 Update paper
PaperMC/Folia@6c59a95 Re-add RandomCommand
PaperMC/Folia@dc3fcef Use postprocess annotation for config
PaperMC/Folia@8cde60d Use tracker field instead of entity map lookup in CraftEntity#getTrackedBy
PaperMC/Folia@905cf0b Fix crash when generating swamp structure

TenseiMC Changes :
Update paperweight to 1.5.7
Drop 88402f3
  • Loading branch information
Euphillya committed Oct 8, 2023
1 parent ae2d482 commit 12c0417
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import io.papermc.paperweight.util.constants.*
plugins {
java
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.papermc.paperweight.patcher") version "1.5.6"
id("io.papermc.paperweight.patcher") version "1.5.7"
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2

foliaRef = e876103942278b4a392634a2e9b204e02d2993a3
foliaRef = 905cf0b6bef5ccc3f2a79b976442978d02f97d05

org.gradle.caching=true
org.gradle.parallel=false
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0020-Halloween-options-and-optimizations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ index b319021b22c5dceba6199ed27814b2dcf47b8d50..f3fb8a193c3858cbc3d0be61db9c1fe5
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 483bf035ad9d278755f5a2c525f7e2ca4cc62211..4bccbdf6bc5f3495b34da73628c626c5689f185c 100644
index ef61663d9ba41cf02a03800c74d4ce4ccc5faec5..e2482c0632f343f1903008ea2e9a611567e7b4c5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -557,11 +557,7 @@ public class Zombie extends Monster {
@@ -549,11 +549,7 @@ public class Zombie extends Monster {
}

if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
Expand Down

This file was deleted.

0 comments on commit 12c0417

Please sign in to comment.