Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
Aikar 2016-12-19 22:58:12 -05:00
parent 4ac2cac9f9
commit c222ffd4cd
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Spigot-Server-Patches/0186-Fix-worldborder-bug.patch
View File

@ -1,23 +0,0 @@
From 2a22771fe6afb21a2ace69a872612ce8b79a466d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Dec 2016 01:23:03 -0500
Subject: [PATCH] Fix worldborder bug
typo in variable name
diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
index 2252fb03f..215e6f5d0 100644
--- a/src/main/java/net/minecraft/server/WorldBorder.java
+++ b/src/main/java/net/minecraft/server/WorldBorder.java
@@ -45,7 +45,7 @@ public class WorldBorder {
// Inlined the getters from ChunkCoordIntPair
public boolean isInBounds(int x, int z) {
- return (double) ((x << 4) + 15) > this.b() && (double) (x << 4) < this.d() && (double) ((z << 4) + 15) > this.c() && (double) (x << 4) < this.e();
+ return (double) ((x << 4) + 15) > this.b() && (double) (x << 4) < this.d() && (double) ((z << 4) + 15) > this.c() && (double) (z << 4) < this.e(); // Paper - fix CraftBukkit bug
}
public boolean a(AxisAlignedBB axisalignedbb) {
--
2.11.0

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4602331b1dfe3699e054bcde8b8bd5670eb1046b
Subproject commit c8ff65136f23a3c2770b8d9ca508f61927f8acba

2
work/Spigot

@ -1 +1 @@
Subproject commit aad97c46dc16cdb9acc1117709590ebd96c19b66
Subproject commit 6f7aabf0f73188de2433ec4570412235772f8fba