even even even more work

This commit is contained in:
MiniDigger | Martin
2020-06-25 16:09:55 +02:00
parent 4aa7955818
commit e943ece469
125 changed files with 857 additions and 3512 deletions

View File

@@ -27,9 +27,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
- public void stopRiding() {
- public void bb() {
+ // Paper start
+ public void stopRiding() { stopRiding(false); }
+ public void bb() { stopRiding(false); }
+ public void stopRiding(boolean suppressCancellation) {
+ // Paper end
if (this.vehicle != null) {
@@ -80,10 +80,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
- @Override
- public void stopRiding() {
- super.stopRiding();
- public void bb() {
- super.bb();
+ // Paper start
+ @Override public void stopRiding() { stopRiding(false); }
+ @Override public void bb() { stopRiding(false); }
+ @Override public void stopRiding(boolean suppressCancellation) {
+ // Paper end
+ super.stopRiding(suppressCancellation); // Paper - suppress
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.ao) & 4) != 0;
return ((Byte) this.datawatcher.get(EntityLiving.an) & 4) != 0;
}
- @Override