Skip to content

Commit c808508

Browse files
committed
Update Rhino to 1.7.14
1 parent 890a9d7 commit c808508

2 files changed

Lines changed: 20 additions & 9 deletions

File tree

patches/server/0003-Rebrand.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 8d8c5a8bd2a53ac6d9b36e0330a7be6725aa407c..70d512c0c70d2470eaca295b6e35bb3be2f3f6a3 100644
8+
index 8d8c5a8bd2a53ac6d9b36e0330a7be6725aa407c..0435c1eb5c1fa6f9180ee8dc36a61afbac0f952e 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -7,9 +7,9 @@ plugins {
@@ -20,17 +20,18 @@ index 8d8c5a8bd2a53ac6d9b36e0330a7be6725aa407c..70d512c0c70d2470eaca295b6e35bb3b
2020
exclude("io.papermc.paper", "paper-api")
2121
}
2222
// Pufferfish end
23-
@@ -42,6 +42,9 @@ dependencies {
23+
@@ -42,6 +42,10 @@ dependencies {
2424
runtimeOnly("mysql:mysql-connector-java:8.0.29")
2525
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
2626

27-
+ implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
27+
+ implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
28+
+ implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
2829
+ implementation("dev.omega24:upnp4j:1.0") // Purpur
2930
+
3031
runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
3132
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
3233
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
33-
@@ -81,7 +84,7 @@ tasks.jar {
34+
@@ -81,7 +85,7 @@ tasks.jar {
3435
attributes(
3536
"Main-Class" to "org.bukkit.craftbukkit.Main",
3637
"Implementation-Title" to "CraftBukkit",
@@ -39,7 +40,7 @@ index 8d8c5a8bd2a53ac6d9b36e0330a7be6725aa407c..70d512c0c70d2470eaca295b6e35bb3b
3940
"Implementation-Vendor" to date, // Paper
4041
"Specification-Title" to "Bukkit",
4142
"Specification-Version" to project.version,
42-
@@ -153,7 +156,7 @@ fun TaskContainer.registerRunTask(
43+
@@ -153,7 +157,7 @@ fun TaskContainer.registerRunTask(
4344
name: String,
4445
block: JavaExec.() -> Unit
4546
): TaskProvider<JavaExec> = register<JavaExec>(name) {

patches/server/0285-Add-skeleton-bow-accuracy-option.patch

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ index e542407894f58fb8c0339a7a6d2e7b2cb5891eb4..0cfe5cb3ce0ac8554bbdb68c66583693
1818
org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
1919
if (event.isCancelled()) {
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
21-
index c0efea82bacda565876b8a01ed1f520706a2d127..af323d3136ca5d51ac122d5758251db965281020 100644
21+
index c0efea82bacda565876b8a01ed1f520706a2d127..11609d1c8e1dc80886435571d7c6ee1aa97fb177 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2424
@@ -2418,6 +2418,8 @@ public class PurpurWorldConfig {
@@ -30,16 +30,26 @@ index c0efea82bacda565876b8a01ed1f520706a2d127..af323d3136ca5d51ac122d5758251db9
3030
private void skeletonSettings() {
3131
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
3232
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
33-
@@ -2432,6 +2434,18 @@ public class PurpurWorldConfig {
33+
@@ -2432,6 +2434,28 @@ public class PurpurWorldConfig {
3434
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
3535
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
3636
skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);
37+
+ final String defaultSkeletonBowAccuracy = skeletonBowAccuracy;
3738
+ skeletonBowAccuracy = getString("mobs.skeleton.bow-accuracy", skeletonBowAccuracy);
3839
+ for (int i = 1; i < 4; i++) {
39-
+ float divergence;
40+
+ final float divergence;
4041
+ try {
4142
+ Entity.scriptEngine.eval("difficulty = " + i);
42-
+ divergence = ((Double)Entity.scriptEngine.eval(skeletonBowAccuracy)).floatValue();
43+
+ final Object result = Entity.scriptEngine.eval(skeletonBowAccuracy);
44+
+ if (result instanceof Long) {
45+
+ divergence = ((Long) result).floatValue();
46+
+ } else if (result instanceof Double) {
47+
+ divergence = ((Double) result).floatValue();
48+
+ } else {
49+
+ set("mobs.skeleton.bow-accuracy", defaultSkeletonBowAccuracy);
50+
+ skeletonBowAccuracy = defaultSkeletonBowAccuracy;
51+
+ divergence = ((Long) Entity.scriptEngine.eval(skeletonBowAccuracy)).floatValue();
52+
+ }
4353
+ } catch (Exception e) {
4454
+ e.printStackTrace();
4555
+ continue;

0 commit comments

Comments
 (0)