mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 05:55:44 +01:00
[CI-SKIP] Rebuild patches
This commit is contained in:
parent
d7bed4cb07
commit
6ea3c2cf3b
@ -1,23 +0,0 @@
|
|||||||
From c42efeb31d4a69a71bc085354af9a809b2db5c28 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zach Brown <zach@zachbr.io>
|
|
||||||
Date: Sat, 8 Feb 2020 18:02:24 -0600
|
|
||||||
Subject: [PATCH] Allow overriding the java version check
|
|
||||||
|
|
||||||
-DPaper.IgnoreJavaVersion=true
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
||||||
index eb5f44e300..af05f3c1e0 100644
|
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
||||||
@@ -175,7 +175,7 @@ public class Main {
|
|
||||||
float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
|
|
||||||
if (javaVersion > 57.0) {
|
|
||||||
System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 13 is supported.");
|
|
||||||
- return;
|
|
||||||
+ if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
--
|
|
||||||
2.25.0
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From e3fe64a27e8199a80cd1390168a8eed437c06243 Mon Sep 17 00:00:00 2001
|
From 4c46bea75ecd08e7ce7b76a555c76a022ebf0791 Mon Sep 17 00:00:00 2001
|
||||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||||
Date: Mon, 27 Jan 2020 21:28:00 -0800
|
Date: Mon, 27 Jan 2020 21:28:00 -0800
|
||||||
Subject: [PATCH] Optimise random block ticking
|
Subject: [PATCH] Optimise random block ticking
|
@ -1,32 +0,0 @@
|
|||||||
From c89b88e0373f8d8238ea8fe2dd8d050d0b773381 Mon Sep 17 00:00:00 2001
|
|
||||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
||||||
Date: Sun, 9 Feb 2020 00:19:05 -0600
|
|
||||||
Subject: [PATCH] Add ThrownEggHatchEvent
|
|
||||||
|
|
||||||
Adds a new event similar to PlayerEggThrowEvent, but without the Player requirement
|
|
||||||
(dispensers can throw eggs to hatch them, too).
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
|
|
||||||
index 970f9109d9..bdd82d052a 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/EntityEgg.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityEgg.java
|
|
||||||
@@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable {
|
|
||||||
hatchingType = event.getHatchingType();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // Paper start
|
|
||||||
+ com.destroystokyo.paper.event.entity.ThrownEggHatchEvent event = new com.destroystokyo.paper.event.entity.ThrownEggHatchEvent((org.bukkit.entity.Egg) getBukkitEntity(), hatching, b0, hatchingType);
|
|
||||||
+ event.callEvent();
|
|
||||||
+
|
|
||||||
+ b0 = event.getNumHatches();
|
|
||||||
+ hatching = event.isHatching();
|
|
||||||
+ hatchingType = event.getHatchingType();
|
|
||||||
+ // Paper end
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if (hatching) {
|
|
||||||
for (int i = 0; i < b0; ++i) {
|
|
||||||
Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F), hatchingType.getEntityClass());
|
|
||||||
--
|
|
||||||
2.25.0
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
|||||||
From 9911996a0ea1415b4aa0505bf54b15624235310e Mon Sep 17 00:00:00 2001
|
From 7986630d78fb8cd77b5e305bd727d537e8fdc10e Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 8 Feb 2020 23:26:11 -0600
|
Date: Sat, 8 Feb 2020 23:26:11 -0600
|
||||||
Subject: [PATCH] Entity Jump API
|
Subject: [PATCH] Entity Jump API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index 1b9551ae0..ad474500e 100644
|
index 1b9551ae09..ad474500e2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity {
|
@@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity {
|
||||||
@ -29,7 +29,7 @@ index 1b9551ae0..ad474500e 100644
|
|||||||
} else {
|
} else {
|
||||||
this.jumpTicks = 0;
|
this.jumpTicks = 0;
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
|
||||||
index cd41c80f1..f50ed1908 100644
|
index cd41c80f19..f50ed19080 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPanda.java
|
--- a/src/main/java/net/minecraft/server/EntityPanda.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPanda.java
|
+++ b/src/main/java/net/minecraft/server/EntityPanda.java
|
||||||
@@ -438,7 +438,9 @@ public class EntityPanda extends EntityAnimal {
|
@@ -438,7 +438,9 @@ public class EntityPanda extends EntityAnimal {
|
||||||
@ -43,7 +43,7 @@ index cd41c80f1..f50ed1908 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||||
index b27fd44dc..277eb54e7 100644
|
index b27fd44dcd..277eb54e79 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||||
@@ -711,5 +711,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
@@ -711,5 +711,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
Loading…
Reference in New Issue
Block a user