mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 15:00:30 +01:00
Remove 'fix Vanilla Minecart speed' patch (#10068)
The game uses 0.95d now
This commit is contained in:
Jake Potrebic
GitHub
parent
b4c9e7e5d4
commit
1e7dd72f15
778 changed files with 26 additions and 50 deletions
|
|
@ -1,24 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Aikar <aikar@aikar.co>
|
|
||||||
Date: Thu, 8 Nov 2018 21:33:09 -0500
|
|
||||||
Subject: [PATCH] Use Vanilla Minecart Speeds
|
|
||||||
|
|
||||||
CraftBukkit changed the values on flying speed, restore back to vanilla
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
||||||
index e390735d411d815dcc4591da58db7017452acf31..b09c4e2a36f653ff6aa0e2c0bc927a8fd7e41ae0 100644
|
|
||||||
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
||||||
@@ -101,9 +101,9 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
||||||
private double derailedX = 0.5;
|
|
||||||
private double derailedY = 0.5;
|
|
||||||
private double derailedZ = 0.5;
|
|
||||||
- private double flyingX = 0.95;
|
|
||||||
- private double flyingY = 0.95;
|
|
||||||
- private double flyingZ = 0.95;
|
|
||||||
+ private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision
|
|
||||||
+ private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
|
|
||||||
+ private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
|
|
||||||
public double maxSpeed = 0.4D;
|
|
||||||
// CraftBukkit end
|
|
||||||
|
|
||||||
|
|
@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
|
||||||
- Allows manipulating the CommandNode to add more children/metadata for the client
|
- Allows manipulating the CommandNode to add more children/metadata for the client
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index 18613ca4e029dc5a514401753b850b442ae45bbf..5106a0e7c7d7f390fa439ca9a14dea94a5764402 100644
|
index b2db0b51895200fc870e536ea97886db3d7a763c..6acb1f37f4c5cb1addd835626041cd3c28eb842f 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
|
@@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
|
||||||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
||||||
index 2d230e1f56be70f6373421c0649b0b9d3f2702e8..725a921c7c8ce458d073333d6a9e8e316dbd6ea8 100644
|
index a822b190aeee1d644c3509bb75106fa4dfdd963f..1a54db9f8b2fb3071e79ec26c49242b528b8cd9e 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
||||||
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
||||||
@@ -184,6 +184,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
|
@@ -184,6 +184,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
|
||||||
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] Improve java version check
|
||||||
Co-Authored-By: MiniDigger <admin@benndorf.dev>
|
Co-Authored-By: MiniDigger <admin@benndorf.dev>
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
index bb2ed43dccac698ea7265739bc1ed253f345d314..17d74aa6d857e49b61f5aed30be2b17be871df4c 100644
|
index ebfebbb9b7de93dd43ee6d0531832a71f8556d33..fdce27bbd60897e7584db627b5f9ff32c930cd78 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
@@ -201,23 +201,27 @@ public class Main {
|
@@ -201,23 +201,27 @@ public class Main {
|
||||||
|
|
@ -320,7 +320,7 @@ index 12834995b2bab9e82a40feb01f038532961296cf..12af77215bfd6df3b6802a567ac3c013
|
||||||
final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
|
final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
|
||||||
net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
|
net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
index 17d74aa6d857e49b61f5aed30be2b17be871df4c..ff16522a4ae4e0cb32f4c6b919bcaffc4507dfe8 100644
|
index fdce27bbd60897e7584db627b5f9ff32c930cd78..fa9c17c49a17b8325a7510316de89e3ff3b6f1cf 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
@@ -179,6 +179,36 @@ public class Main {
|
@@ -179,6 +179,36 @@ public class Main {
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue