Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

More cleaning up from removal of entity jump patch

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-12 21:39:26 -06:00
parent d0fa118d91
commit 39245ad693
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0003-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 197fcefe99b9fb6894257ea88e07afcd41797298 Mon Sep 17 00:00:00 2001 From 3474d5f429c81085846778662112ce25f0824d74 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600 Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables Subject: [PATCH] Ridables
@@ -332,7 +332,7 @@ index 34239160b..a6218158e 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index c7d79efdf..98fa57a1c 100644 index c7d79efdf..0918beac9 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java --- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -468,7 +468,7 @@ index c7d79efdf..98fa57a1c 100644
+ float vertical = forward == 0.0F ? 0.0F : -(rider.pitch / 90.0F); + float vertical = forward == 0.0F ? 0.0F : -(rider.pitch / 90.0F);
+ float strafe = rider.getStrafe(); + float strafe = rider.getStrafe();
+ +
+ if (rider.isJumping() && net.pl3x.purpur.controller.ControllerMoveWASD.spacebarEvent(entity)) { + if (rider.jumping && net.pl3x.purpur.controller.ControllerMoveWASD.spacebarEvent(entity)) {
+ entity.onSpacebar(); + entity.onSpacebar();
+ } + }
+ +
@@ -3650,7 +3650,7 @@ index d02db5659..d3708a7b0 100644
this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class)); this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class));
this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class)); this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class));
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 92efe4e7f..e3dc5f1f6 100644 index 92efe4e7f..b967135ac 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java --- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal { @@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -3708,7 +3708,7 @@ index 92efe4e7f..e3dc5f1f6 100644
+ EntitySquid squid = getSquid(); + EntitySquid squid = getSquid();
+ EntityHuman rider = squid.getRider(); + EntityHuman rider = squid.getRider();
+ if (rider != null) { + if (rider != null) {
+ if (rider.isJumping()) { + if (rider.jumping) {
+ squid.onSpacebar(); + squid.onSpacebar();
+ } + }
+ float forward = rider.getForward(); + float forward = rider.getForward();
@@ -3799,7 +3799,7 @@ index ef8f373be..992978463 100644
protected void initDatawatcher() { protected void initDatawatcher() {
super.initDatawatcher(); super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index dd02cb348..12a9927cd 100644 index dd02cb348..85fabbc50 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java --- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal { @@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal {
@@ -3882,7 +3882,7 @@ index dd02cb348..12a9927cd 100644
+ vertical = 0.0F; + vertical = 0.0F;
+ } + }
+ +
+ if (rider.isJumping()) { + if (rider.jumping) {
+ entity.onSpacebar(); + entity.onSpacebar();
+ } + }
+ +
@@ -3924,7 +3924,7 @@ index dd02cb348..12a9927cd 100644
+ +
+ ((net.pl3x.purpur.controller.ControllerLookWASD) entity.getControllerLook()).setOffsets(yawOffset, 0); + ((net.pl3x.purpur.controller.ControllerLookWASD) entity.getControllerLook()).setOffsets(yawOffset, 0);
+ +
+ if (rider.isJumping()) { + if (rider.jumping) {
+ //RidableSpacebarEvent event = new RidableSpacebarEvent(entity); + //RidableSpacebarEvent event = new RidableSpacebarEvent(entity);
+ if (/*event.callEvent() && !event.isHandled() &&*/ !entity.onSpacebar() && entity.onGround) { + if (/*event.callEvent() && !event.isHandled() &&*/ !entity.onSpacebar() && entity.onGround) {
+ entity.jump(); + entity.jump();
@@ -5247,7 +5247,7 @@ index 000000000..828e1b873
+} +}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
new file mode 100644 new file mode 100644
index 000000000..a9b28dabe index 000000000..0a5d6d46c
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
@@ -5316,7 +5316,7 @@ index 000000000..a9b28dabe
+ +
+ ((ControllerLookWASD) entity.getControllerLook()).setOffsets(yawOffset, 0); + ((ControllerLookWASD) entity.getControllerLook()).setOffsets(yawOffset, 0);
+ +
+ if (rider.isJumping() && spacebarEvent(entity) && !entity.onSpacebar() && entity.onGround) { + if (rider.jumping && spacebarEvent(entity) && !entity.onSpacebar() && entity.onGround) {
+ entity.doJump(); + entity.doJump();
+ } + }
+ +
@@ -5339,7 +5339,7 @@ index 000000000..a9b28dabe
+} +}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
new file mode 100644 new file mode 100644
index 000000000..5aac2d76d index 000000000..3246a9f0a
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@@ -5374,7 +5374,7 @@ index 000000000..5aac2d76d
+ float vertical = forward == 0.0F ? 0.0F : -(rider.pitch / 45.0F); + float vertical = forward == 0.0F ? 0.0F : -(rider.pitch / 45.0F);
+ float strafe = rider.getStrafe(); + float strafe = rider.getStrafe();
+ +
+ if (rider.isJumping() && spacebarEvent(entity)) { + if (rider.jumping && spacebarEvent(entity)) {
+ entity.onSpacebar(); + entity.onSpacebar();
+ } + }
+ +
@@ -5404,7 +5404,7 @@ index 000000000..5aac2d76d
+} +}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
new file mode 100644 new file mode 100644
index 000000000..68f9184fc index 000000000..5c66e5b23
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
@@ -5445,7 +5445,7 @@ index 000000000..68f9184fc
+ speed *= groundSpeedModifier; + speed *= groundSpeedModifier;
+ } + }
+ +
+ if (rider.isJumping() && spacebarEvent(entity) && !entity.onSpacebar()) { + if (rider.jumping && spacebarEvent(entity) && !entity.onSpacebar()) {
+ entity.setNoGravity(true); + entity.setNoGravity(true);
+ vertical = 1.0F; + vertical = 1.0F;
+ } else { + } else {
@@ -5475,7 +5475,7 @@ index 000000000..68f9184fc
+} +}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
new file mode 100644 new file mode 100644
index 000000000..23931dafb index 000000000..e75e58067
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
@@ -5507,7 +5507,7 @@ index 000000000..23931dafb
+ vertical = 0.0F; + vertical = 0.0F;
+ } + }
+ +
+ if (rider.isJumping() && spacebarEvent(entity)) { + if (rider.jumping && spacebarEvent(entity)) {
+ entity.onSpacebar(); + entity.onSpacebar();
+ } + }
+ +

6
patches/server/0029-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From f7d4291b5564a17d4fa7fe1f13c506f60d643e9e Mon Sep 17 00:00:00 2001 From 4d9591706edfc7b7ce94d265820bc3903e56fa0c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500 Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts Subject: [PATCH] Controllable Minecarts
@@ -23,7 +23,7 @@ index c6a97d6b5..dbd7236d8 100644
return this.inLava; return this.inLava;
} }
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 665bbe07f..57288aa73 100644 index 665bbe07f..1f3e5bd28 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -357,12 +357,50 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -357,12 +357,50 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -56,7 +56,7 @@ index 665bbe07f..57288aa73 100644
+ Entity passenger = passengers.get(0); + Entity passenger = passengers.get(0);
+ if (passenger instanceof EntityHuman) { + if (passenger instanceof EntityHuman) {
+ EntityHuman entityhuman = (EntityHuman) passenger; + EntityHuman entityhuman = (EntityHuman) passenger;
+ if (entityhuman.isJumping()) { + if (entityhuman.jumping) {
+ Vec3D mot = getMot(); + Vec3D mot = getMot();
+ setMot(mot.x, world.purpurConfig.controllableMinecartsHopBoost, mot.z); + setMot(mot.x, world.purpurConfig.controllableMinecartsHopBoost, mot.z);
+ } + }