SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Climbing should not bypass cramming gamerule

Browse Source
This commit is contained in:
William Blake Galbreath
2020-08-23 20:59:00 +02:00
parent e0fe76747b
commit 22069fd885
9 changed files with 196 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch
View File

@@ -18,12 +18,14 @@
if (player.isCreative() || !this.isInvulnerable()) {
this.hurt(this.damageSources().playerAttack(player), Float.MAX_VALUE);
}
@@ -363,7 +363,7 @@
@@ -362,8 +362,8 @@
}
@Override
public boolean isPushable() {
- public boolean isPushable() {
- return true;
+ return super.isPushable(); // CraftBukkit - collidable API
+ public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
+ return super.isCollidable(ignoreClimbing); // CraftBukkit - collidable API // Paper - Climbing should not bypass cramming gamerule
}
@Override

16
paper-server/patches/sources/net/minecraft/world/entity/animal/horse/AbstractHorse.java.patch
View File

@@ -73,6 +73,15 @@
protected AbstractHorse(EntityType<? extends AbstractHorse> type, Level world) {
super(type, world);
@@ -312,7 +369,7 @@
}
@Override
- public boolean isPushable() {
+ public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
return !this.isVehicle();
}
@@ -366,7 +423,7 @@
public void createInventory() {
SimpleContainer inventorysubcontainer = this.inventory;
@@ -117,14 +126,15 @@
if (!this.inventory.getItem(0).isEmpty()) {
nbt.put("SaddleItem", this.inventory.getItem(0).save(this.registryAccess()));
@@ -910,6 +968,11 @@
@@ -909,7 +967,12 @@
if (uuid != null) {
this.setOwnerUUID(uuid);
}
+ }
+ // CraftBukkit start
+ if (nbt.contains("Bukkit.MaxDomestication")) {
+ this.maxDomestication = nbt.getInt("Bukkit.MaxDomestication");
+ }
}
+ // CraftBukkit end
if (nbt.contains("SaddleItem", 10)) {