9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-23 00:49:23 +00:00

Fix error in rebase

This commit is contained in:
violetc
2022-08-17 10:31:39 +08:00
parent 0160d7eb95
commit b5569bd501
22 changed files with 50 additions and 45 deletions

View File

@@ -38,10 +38,10 @@ index eda98b85fb00fe7787d2f7a643c3854aa4b02fbf..1f1bed78e8d003cfd85bc5cf38014c3d
private Vec3 deltaMovement;
public float yRot; // Paper - private->public
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 29257079b209b0bd04f24d512bbcfca4bff9b860..fc218fbbe670020e3dd180901e0ba7b048ccbbed 100644
index f157ee3c0b37fab427c9ce97ac3d28ddca831f8b..fbdead4eaeee7bb730c23d6228ae939ce9c01971 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -238,6 +238,11 @@ public final class LeavesConfig {
@@ -243,6 +243,11 @@ public final class LeavesConfig {
fixPaper6045 = getBoolean("settings.performance.fix.fix-paper-6045", fixPaper6045);
}