mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 00:30:25 +01:00
4f7a858bd6
c2d29a73 PlayerElytraBoostEvent (BillyGalbreath)
* pull/1248/head:
PlayerElytraBoostEvent
Also merged paper config into parent
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 227e944778893d855f8d85e11d8ffd0dad2354ec Mon Sep 17 00:00:00 2001
|
|
From: Sudzzy <originmc@outlook.com>
|
|
Date: Wed, 2 Mar 2016 14:57:24 -0600
|
|
Subject: [PATCH] Disable ice and snow
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index a27e52d03..ab119b914 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -158,4 +158,9 @@ public class PaperWorldConfig {
|
|
private void disableThunder() {
|
|
disableThunder = getBoolean("disable-thunder", false);
|
|
}
|
|
+
|
|
+ public boolean disableIceAndSnow;
|
|
+ private void disableIceAndSnow(){
|
|
+ disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 5ee771e83..dd09ab20e 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -513,7 +513,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
}
|
|
|
|
this.methodProfiler.c("iceandsnow");
|
|
- if (this.random.nextInt(16) == 0) {
|
|
+ if (!this.paperConfig.disableIceAndSnow && this.random.nextInt(16) == 0) { // Paper - Disable ice and snow
|
|
this.m = this.m * 3 + 1013904223;
|
|
l = this.m >> 2;
|
|
blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
|
|
--
|
|
2.18.0
|
|
|