twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-31 20:22:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on server patches

Browse Source
This commit is contained in:
Shane Freeder
2019-12-11 00:56:03 +00:00
parent f181496be3
commit 0d64f85acc
42 changed files with 326 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/Configurable-fishing-time-ranges.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable fishing time ranges
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 1aa046bfa..d9461dec6 100644
index 912611cf1..7d9976ce6 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -22,17 +22,17 @@ index 1aa046bfa..d9461dec6 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index cdcad4c29..19a6233c3 100644
index c899a99eb..b10de807e 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
this.at = MathHelper.nextInt(this.random, 20, 80);
this.aq = MathHelper.nextInt(this.random, 20, 80);
}
} else {
- this.as = MathHelper.nextInt(this.random, 100, 600);
+ this.as = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
this.as -= this.ax * 20 * 5;
+ this.as = Math.max(0, this.as); // Paper - Don't allow negative values
- this.ap = MathHelper.nextInt(this.random, 100, 600);
+ this.ap = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
this.ap -= this.au * 20 * 5;
+ this.ap = Math.max(0, this.ap); // Paper - Don't allow negative values
}
}