drop some

This commit is contained in:
Ben Kerllenevich
2021-11-25 11:52:45 -05:00
parent 27ef8b2d92
commit 516b9ad8f3
123 changed files with 22 additions and 99 deletions

View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8766be89f7bc2f3ce427d4ec428d1fa65a10d995..47067ff24923002f9083022cbec4a90896ce3012 100644
index 1d5ab54742ee9818ffd8cf1687e89269f449e6c4..1428e4f1aa8262ff33c789c419451ecef192116f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1502,7 +1502,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

View File

@@ -5,7 +5,7 @@ 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 244440eb9d4e85cb73bb6c0dd645d069a036917c..a66827bc04d05f9643e00ecd4bc3595cc7517b78 100644
index dd186ad2080d358ee1ed5c8ac6725a9e3dcaeb39..8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1171,6 +1171,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 244440eb9d4e85cb73bb6c0dd645d069a036917c..a66827bc04d05f9643e00ecd4bc3595c
// 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 47067ff24923002f9083022cbec4a90896ce3012..a3420d0a30fbb3f837c863ef559f66ddaa6dc6bd 100644
index 1428e4f1aa8262ff33c789c419451ecef192116f..197326d2831f804620fbfe289a1617ec94cf891c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2626,12 +2626,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

View File

@@ -575,7 +575,7 @@ index 6ba83c938456dc79c8cd948ae981c6f2e93702ae..ed1c473ef80202b3aa4996b5acb97288
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index c935177150c8270329dbf7cc43da31c603555c52..580af65dd27616cd6c17f3b8e39abbb1c4549ef4 100644
index 86cd0a6d42a232ad81e0593f3b5b23c97d20db39..29351213075a26b5beefeeba012d05fc9c986696 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -218,6 +218,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob

View File

@@ -17,7 +17,7 @@ index ed1c473ef80202b3aa4996b5acb9728857eaec8c..ea5e71b2264c73888d9355f31177a50c
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index 580af65dd27616cd6c17f3b8e39abbb1c4549ef4..edd9c27c21bd3c377ecb9f14541140b73642c694 100644
index 29351213075a26b5beefeeba012d05fc9c986696..b6f1ad54cdacafb0995a992ff3990a5517380ab3 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -733,6 +733,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a66827bc04d05f9643e00ecd4bc3595cc7517b78..75879a818d7adae2a4d027b66ced5d7d2270729f 100644
index 8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd..0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1321,7 +1321,7 @@ public class ServerPlayer extends Player {

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a3420d0a30fbb3f837c863ef559f66ddaa6dc6bd..c422495386021e2b1b0048d608ca06f4703e1f34 100644
index 197326d2831f804620fbfe289a1617ec94cf891c..ce02c8ba13c3e940709361e91747f9c97a166f18 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -502,7 +502,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index c422495386021e2b1b0048d608ca06f4703e1f34..b8a7af8b7dc7b76566fc462969797bd5c4530e8f 100644
index ce02c8ba13c3e940709361e91747f9c97a166f18..35a04f593c66ae898b8b891dd4082aefe4d3feef 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1019,7 +1019,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

View File

@@ -17,7 +17,7 @@ index 945fb3200d52b83eaee2e62d6db5c43e088218eb..a87a532ce9e69bf4a90aac73ad51e4a8
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 75879a818d7adae2a4d027b66ced5d7d2270729f..10802bbcebb9a8bc05396573a51d347c0022bc34 100644
index 0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc..3ad8167804f38262e1e7ecd878fce76573568ab8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -910,6 +910,7 @@ public class ServerPlayer extends Player {

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b8a7af8b7dc7b76566fc462969797bd5c4530e8f..9b817c1754f035b9a6b066bdbfa323191f2679ff 100644
index 35a04f593c66ae898b8b891dd4082aefe4d3feef..a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4253,5 +4253,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9b817c1754f035b9a6b066bdbfa323191f2679ff..335b08aa2806bacbde99148af9dc7ca129fdc0d4 100644
index a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b..3f2a2b8ff167a50d8c29583a7f4ee708b5ca77bb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2677,7 +2677,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Structure seed options
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index c34023c69c9a97824417a40f5fac8f2e71f4b6f3..98686a2c86d4f2fabf027ad05824b218ac4ff6a8 100644
index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76efe1b851f8 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -587,6 +587,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
@@ -580,6 +580,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
case "village":
seed = conf.villageSeed;
break;

View File

@@ -93,7 +93,7 @@ index d457978c0345aa51c03880cf87a08494b2e117c5..51aaacb529c052e3e9b96a1f6db454d8
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index edd9c27c21bd3c377ecb9f14541140b73642c694..e711e68d245c2dabb76e8a200c3f353c6ece0886 100644
index b6f1ad54cdacafb0995a992ff3990a5517380ab3..2943342e6dddc3b89411b7a6548d56b69a201d25 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -86,6 +86,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob

View File

@@ -17,7 +17,7 @@ index 2be6bbe31c61a9b66c685cca79407c26dd99cf1b..3ee6451e9aa21738c2e89a6609cc5cbf
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 10802bbcebb9a8bc05396573a51d347c0022bc34..1e9ad5756eb56c69f2f28a0b912663a6cde1ae59 100644
index 3ad8167804f38262e1e7ecd878fce76573568ab8..a6176958f1eac3bf6b49ec48a9fe99fff5d847a7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -257,6 +257,7 @@ public class ServerPlayer extends Player {

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for Wither's spawn sound
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index e711e68d245c2dabb76e8a200c3f353c6ece0886..fa803a71110f40abce9be682ce1c4863d4690829 100644
index 2943342e6dddc3b89411b7a6548d56b69a201d25..5ca3d7dfadb213530739863571fa6cafb819d82d 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -414,7 +414,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob

Some files were not shown because too many files have changed in this diff Show More