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

Update to 1.14.3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-25 21:12:19 -05:00
parent 5d6c6b7efa
commit 4bc7fbcdfa
23 changed files with 444 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 7c79f28cea1dd116bb5426eb673c8a9d91cd5a6b Mon Sep 17 00:00:00 2001
From 9723b774d584480d457b3777d8c8334572d9fbd8 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
@@ -1107,7 +1107,7 @@ index 0000000000..37093419cf
+ }
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index d89ad4e390..aa70bbd31f 100644
index e2a48695df..d19412f186 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -315,7 +315,7 @@ public class Chunk implements IChunkAccess {
@@ -1120,11 +1120,11 @@ index d89ad4e390..aa70bbd31f 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
index 799c134e4b..80d18dc308 100644
index 7a76db08fc..5c646c646b 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -196,10 +196,12 @@ public abstract class ChunkMapDistance {
this.f.b(i, this.a(objectsortedset), false);
@@ -177,10 +177,12 @@ public abstract class ChunkMapDistance {
this.e.b(i, this.a(objectsortedset), false);
}
+ public <T> void addTicketLevel(TicketType<T> type, ChunkCoordIntPair chunkPos, int level, T reason) { this.a(type, chunkPos, level, reason); } // Paper - OBFHELPER
@@ -1137,10 +1137,10 @@ index 799c134e4b..80d18dc308 100644
Ticket<T> ticket = new Ticket<>(tickettype, i, t0, this.currentTick);
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 459bd619ee..6e22632dec 100644
index 42b97ba86b..88cd325313 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -512,6 +512,16 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -511,6 +511,16 @@ public class ChunkProviderServer extends IChunkProvider {
});
}
@@ -1158,7 +1158,7 @@ index 459bd619ee..6e22632dec 100644
this.chunkMapDistance.addTicket(tickettype, chunkcoordintpair, i, t0);
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 4906530d83..533562f6ab 100644
index 287f113581..f88e3d957f 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -74,7 +74,7 @@ public class ChunkRegionLoader {
@@ -1180,7 +1180,7 @@ index 4906530d83..533562f6ab 100644
object = protochunk;
protochunk.a(abiomebase);
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index 43f75fc837..01102f80ec 100644
index c4c181c1d5..609ec29d6b 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -6,21 +6,32 @@ public class ChunkSection {
@@ -1547,10 +1547,10 @@ index ef71a1feb3..c46a08a520 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 97040528a0..9898fab280 100644
index 761cd1355b..cb3363a01e 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -146,6 +146,9 @@ public class PlayerChunk {
@@ -150,6 +150,9 @@ public class PlayerChunk {
}
public void a(Chunk chunk) {
@@ -1561,10 +1561,10 @@ index 97040528a0..9898fab280 100644
World world = chunk.getWorld();
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 89649e73e5..18ab79c7e3 100644
index 8e16d6ac87..210a7e8206 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -493,7 +493,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -491,7 +491,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
PlayerChunkMap.LOGGER.error("Couldn't load chunk {}", chunkcoordintpair, exception);
}
@@ -1573,7 +1573,7 @@ index 89649e73e5..18ab79c7e3 100644
}, this.executor);
}
@@ -1109,6 +1109,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1111,6 +1111,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
private void a(EntityPlayer entityplayer, Packet<?>[] apacket, Chunk chunk) {
if (apacket[0] == null) {
@@ -1583,7 +1583,7 @@ index 89649e73e5..18ab79c7e3 100644
apacket[1] = new PacketPlayOutLightUpdate(chunk.getPos(), this.lightEngine);
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 7f90a617fe..e00d8ab3ef 100644
index 83b36b3e7f..8fef6008d1 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -207,6 +207,8 @@ public class PlayerInteractManager {
@@ -1651,7 +1651,7 @@ index d2bf158a91..cac427fda7 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 e2a3ab0e62..3105353a48 100644
index c8f198fdf0..c30d77be58 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;