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-05-19 01:55:18 -05:00
parent b247fbd4eb
commit 0554ce8234
4 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From c9543a4248fea54a7443375e7074f7af940aec86 Mon Sep 17 00:00:00 2001
From 752ca48604bb36245438910284ff165e3ac6ee4e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -64,7 +64,7 @@ index 454627f65..df3d6cf28 100644
this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ab0995c2c..e39510e20 100644
index 74f00b376..777e6ee3c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -139,10 +139,10 @@ index a374c3051..9af1c2a09 100644
this.forceDrops = true; // CraftBukkit
this.a((IMaterial) Items.EGG);
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index 56394ccdc..9e5542ade 100644
index d1f3f7f43..2558e1e01 100644
--- a/src/main/java/net/minecraft/server/EntityDolphin.java
+++ b/src/main/java/net/minecraft/server/EntityDolphin.java
@@ -519,7 +519,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -524,7 +524,7 @@ public class EntityDolphin extends EntityWaterAnimal {
}
}
@@ -151,7 +151,7 @@ index 56394ccdc..9e5542ade 100644
private final EntityDolphin i;
@@ -528,8 +528,21 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -533,8 +533,21 @@ public class EntityDolphin extends EntityWaterAnimal {
this.i = entitydolphin;
}
@@ -494,7 +494,7 @@ index 4bea5f1ea..ac13282a1 100644
this.setSneaking(false);
} else {
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index ba90cdef1..cc3e7dcad 100644
index 5cc08ca7c..ca4e9d0dd 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -63,8 +63,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -519,7 +519,7 @@ index ba90cdef1..cc3e7dcad 100644
@Override
public void o(float f) {
super.o(f);
@@ -1061,7 +1065,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1057,7 +1061,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -528,7 +528,7 @@ index ba90cdef1..cc3e7dcad 100644
}
public boolean dH() {
@@ -1359,4 +1363,48 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1355,4 +1359,48 @@ public abstract class EntityInsentient extends EntityLiving {
public boolean a(Item item) {
return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
}

34
patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch
View File

@@ -1,13 +1,13 @@
From a75c3aea676e3f4d63a74ebd6f17b443165f7cb3 Mon Sep 17 00:00:00 2001
From 015122f2521686cbc28dbfb986d376b666402cf6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 10 May 2019 19:17:36 -0500
Subject: [PATCH] Add config to suppress specific log outputs
---
src/main/java/net/minecraft/server/GenericAttributes.java | 1 +
src/main/java/net/minecraft/server/WorldServer.java | 3 ++-
src/main/java/net/minecraft/server/WorldServer.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++
3 files changed, 10 insertions(+), 1 deletion(-)
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 908f11f98..20c3b37d3 100644
@@ -22,28 +22,18 @@ index 908f11f98..20c3b37d3 100644
} else {
a(attributeinstance, nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 101f4ee5d..6c41c65fc 100644
index 3ed12672e..d82102bd8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,7 +1,6 @@
package net.minecraft.server;
@@ -985,7 +985,7 @@ public class WorldServer extends World {
return false;
}
- if (DEBUG_ENTITIES && entity.world.paperConfig.duplicateUUIDMode != PaperWorldConfig.DuplicateUUIDMode.NOTHING) {
+ if (net.pl3x.purpur.PurpurConfig.showDuplicateEntityUUIDErrors && DEBUG_ENTITIES && entity.world.paperConfig.duplicateUUIDMode != PaperWorldConfig.DuplicateUUIDMode.NOTHING) { // Purpur
WorldServer.LOGGER.error("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit // paper
WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper
import co.aikar.timings.TimingHistory;
-import co.aikar.timings.Timings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -977,8 +976,10 @@ public class WorldServer extends World {
if (entity1 == null) {
return false;
} else {
+ if (net.pl3x.purpur.PurpurConfig.showDuplicateEntityUUIDErrors) { // Purpur
WorldServer.LOGGER.error("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit // paper
WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper
+ } // Purpur
return true;
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 28f80e1a5..d75580ce6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java