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

make initAttributes non abstract

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 23:00:24 -05:00
parent afabb3c5b6
commit fb509120d8
15 changed files with 48 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0154-Fix-stuck-in-portals.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1d8172fbae5d002fe20af1e785077785cf8add97..1709b5c1409aebee64ed6f84f405b8c0b20c6934 100644
index 820e1b059fedcc5fe4ccbec772594dddce71fecb..baefaa7bd81ef1fdec6f1b2a03c1a8bff42ce84c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1144,6 +1144,7 @@ public class ServerPlayer extends Player {
@@ -1136,6 +1136,7 @@ public class ServerPlayer extends Player {
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();
@@ -17,7 +17,7 @@ index 1d8172fbae5d002fe20af1e785077785cf8add97..1709b5c1409aebee64ed6f84f405b8c0
// CraftBukkit end
this.setLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e879f7bdee9c58533a549f22286ebb8a22a30442..92a1c059b248e14b16efbca7824d9a1a474b9f85 100644
index 5ad88dccb7fdc2630a273e6645f8612079c51fd2..905e27566ee70f89a9aeb5ae3cf18335c44195f3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2506,12 +2506,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -37,7 +37,7 @@ index e879f7bdee9c58533a549f22286ebb8a22a30442..92a1c059b248e14b16efbca7824d9a1a
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b9ea0b66cd90abc757fe0dd046a84529fd49dca4..906d95f6f43b950a52192b9048e4a2f58d404e9f 100644
index 5f50906a8facde4300995da5c0a634b2eb77fb14..60df4d666c269eaabbb0b5ebf7fd6eef4261d111 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -282,6 +282,7 @@ public class PurpurWorldConfig {