mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-17 00:55:10 +02:00
f07313c43f
Fixes the issue of mobs constantly going North-West in pens and other areas backported from 1.8
72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
From 4c099f1b1105f8fbdcbf7cf360a304b00ca2b139 Mon Sep 17 00:00:00 2001
|
|
From: gsand <gsandowns@gmail.com>
|
|
Date: Sun, 6 Jul 2014 02:46:20 -0500
|
|
Subject: [PATCH] Inverted Daylight Detector Toggle
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockDaylightDetector.java b/src/main/java/net/minecraft/server/BlockDaylightDetector.java
|
|
index 96e9c37..dc84635 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockDaylightDetector.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockDaylightDetector.java
|
|
@@ -1,5 +1,7 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot
|
|
+
|
|
import java.util.Random;
|
|
|
|
public class BlockDaylightDetector extends BlockContainer {
|
|
@@ -38,14 +40,27 @@ public class BlockDaylightDetector extends BlockContainer {
|
|
f += (6.2831855F - f) * 0.2F;
|
|
}
|
|
|
|
- i1 = Math.round((float) i1 * MathHelper.cos(f));
|
|
- if (i1 < 0) {
|
|
- i1 = 0;
|
|
- }
|
|
+ // PaperSpigot start - Inverted Daylight Detectors
|
|
+ if (PaperSpigotWorldConfig.InvertedDaylightDetectors) {
|
|
+ i1 = Math.round((float) i1 * MathHelper.cos(f) * -1 + 15);
|
|
+ if (i1 < 10) {
|
|
+ i1 = 0;
|
|
+ }
|
|
|
|
- if (i1 > 15) {
|
|
- i1 = 15;
|
|
+ if (i1 > 9) {
|
|
+ i1 = 15;
|
|
+ }
|
|
+ } else {
|
|
+ i1 = Math.round((float) i1 * MathHelper.cos(f));
|
|
+ if (i1 < 0) {
|
|
+ i1 = 0;
|
|
+ }
|
|
+
|
|
+ if (i1 > 15) {
|
|
+ i1 = 15;
|
|
+ }
|
|
}
|
|
+ // PaperSpigot end
|
|
|
|
if (l != i1) {
|
|
i1 = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, i, j, k, l, i1).getNewCurrent(); // CraftBukkit - Call BlockRedstoneEvent
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
index 29863cd..c219cab 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
@@ -109,4 +109,11 @@ public class PaperSpigotWorldConfig
|
|
{
|
|
babyZombieMovementSpeed = getDouble( "baby-zombie-movement-speed", 0.5D );
|
|
}
|
|
+
|
|
+ public static boolean InvertedDaylightDetectors;
|
|
+ private void InvertedDaylightDetectors()
|
|
+ {
|
|
+ InvertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false );
|
|
+ log( "Inverted Redstone Lamps: " + InvertedDaylightDetectors );
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|