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

Updated Upstream (Paper)

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

Paper Changes:
cf82dad3 Fix Non Full Status Chunk NBT Memory Leak
5a12515a Update Log4J Configuration file to stop truncating stack traces
7c001d64 More Improvements to Chunks
e1c45196 Fix high memory use of non ticking chunks
ee9f0d51 Fix another case of breaking blocks causing sync chunk loads
6009ba8f Drop AABB limit patch until it can be tested more
0e9c24e5 Fix log spam about Hanging entities bounding boxes
83fadad7 Fix conversion for deserializing raw nbt itemstacks - Fixes #3424
4d38ee11 Many fixes and improvements to chunk prioritization
281181c7 Use saner Entity bounding box limits
edd6b6a2 Protect the visible chunk map from plugins touching it, trim Timing Errors
18c68657 Optimize performance of object pool
7e1525ea Many improvements to chunk prioritization and bug fixes
c82b292a Fix pooled buffer leak resulting in dynmap black spots - Fixes #3386
63274472 Fix ./paper edit continue for Windows
eb5a3058 Fix path in CONTRIBUTING.md (#3406)
f6ed326d Fix a small error in CONTRIBUTING.md (#3403)
614a664b Implement Chunk Priority / Urgency System for Chunks
This commit is contained in:
William Blake Galbreath
2020-05-23 10:21:51 -05:00
parent 860c86191a
commit 3e808f90ec
15 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0113-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 62f89ef6290a97c5149e838728a711a2766356ad Mon Sep 17 00:00:00 2001
From 4f5c6cd5333bd2f911b097d038ab0b87e0b5a166 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
@@ -12,7 +12,7 @@ Subject: [PATCH] Player invulnerabilities
5 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c4a6f94a3..d6415a506 100644
index 5a64da6a3..265bb0757 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -131,6 +131,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -24,7 +24,7 @@ index c4a6f94a3..d6415a506 100644
}
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -726,6 +728,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -727,6 +729,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -37,7 +37,7 @@ index c4a6f94a3..d6415a506 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -733,7 +741,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -734,7 +742,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.m() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -46,7 +46,7 @@ index c4a6f94a3..d6415a506 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1000,6 +1008,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1001,6 +1009,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end
@@ -55,7 +55,7 @@ index c4a6f94a3..d6415a506 100644
return this;
}
}
@@ -1988,9 +1998,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1989,9 +1999,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public