Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
df0d7b0d Update upstream CB
6ea3c2cf [CI-SKIP] Rebuild patches
d7bed4cb Heavily optimise random block ticking (#2914)
b66d9ff8 Update upstream CB
ba71c5d6 Stop stripping private use block Unicode from signs
28d9dcfc Entity Jump API (#1587)
9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion
054e20da Clean up imports on ThrownEggHatchEvent
a8984ccb Add ThrownEggHatchEvent (#1982)
9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
This commit is contained in:
William Blake Galbreath
2020-02-12 21:21:34 -06:00
parent e52e23265f
commit 4757060211
159 changed files with 6166 additions and 4642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/api/0001-Rebrand.patch
View File

@@ -1,12 +1,12 @@
From 3fcfaee80a5a2fda4d08e86daf4401f4d8529ab2 Mon Sep 17 00:00:00 2001
From 991336514b39c0b09f2aa31b78647b0a9728e40f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Rebrand
---
pom.xml | 13 ++++++-------
src/main/java/co/aikar/timings/TimingsExport.java | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
src/main/java/co/aikar/timings/TimingsExport.java | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cb97140..58a1f7d0 100644
@@ -46,25 +46,18 @@ index 2cb97140..58a1f7d0 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 23eb8c65..667de7bd 100644
index 23eb8c65..b3739826 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -283,13 +283,13 @@ class TimingsExport extends Thread {
@@ -283,7 +283,7 @@ class TimingsExport extends Thread {
String response = null;
String timingsURL = null;
try {
- HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
+ HttpURLConnection con = (HttpURLConnection) new URL("https://timings.pl3x.net/post").openConnection();
+ HttpURLConnection con = (HttpURLConnection) new URL("http://timings.pl3x.net/post").openConnection();
con.setDoOutput(true);
String hostName = "BrokenHost";
try {
hostName = InetAddress.getLocalHost().getHostName();
} catch (Exception ignored) {}
- con.setRequestProperty("User-Agent", "Paper/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName);
+ con.setRequestProperty("User-Agent", "Purpur/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName);
con.setRequestMethod("POST");
con.setInstanceFollowRedirects(false);
--
2.24.0