Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-03 19:07:54 -05:00
parent fd25a2671c
commit 2ccb7b1b8d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 1bacdbd169...0d079188ea

2
current-paper
View File

@@ -1 +1 @@
1.14.3--8ee638466c371aafff0b09e2c6d949b1f3a3156b
1.14.3--8a09ec0597392dd0a130182fb18bf9c6eeaa5ac2

8
patches/server/0036-Anti-Xray.patch
View File

@@ -1,4 +1,4 @@
From aded92344a7a557a303f95c9141040897596c767 Mon Sep 17 00:00:00 2001
From e9a62a448db697a19aace112cddb3826e30729aa Mon Sep 17 00:00:00 2001
From: stonar96 <minecraft.stonar96@gmail.com>
Date: Mon, 20 Aug 2018 03:03:58 +0200
Subject: [PATCH] Anti-Xray
@@ -49,7 +49,7 @@ index 81987e4ad..5942c3438 100644
}
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 58109e130..b03d3ee84 100644
index 4d3c6c6b4..929f5c303 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -1,7 +1,11 @@
@@ -64,7 +64,7 @@ index 58109e130..b03d3ee84 100644
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -509,4 +513,43 @@ public class PaperWorldConfig {
@@ -504,4 +508,43 @@ public class PaperWorldConfig {
private void maxAutoSaveChunksPerTick() {
maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
}
@@ -1684,7 +1684,7 @@ index d2bf158a9..2eeae60d5 100644
public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
return new TicketType<>(s, comparator, 0L);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index bd8c0b33e..2ff482d91 100644
index c8f198fdf..c30d77be5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2,6 +2,8 @@ package net.minecraft.server;