tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3298 from TBiscuit1/mc1.18/dev

Browse source 
Fixed kinetic blocks able to surpass the rpm limit
This commit is contained in:
simibubi 2022-08-01 15:24:59 +02:00 committed by GitHub
commit b1a5bf7744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java
View file

@ -36,7 +36,7 @@ public class RotationPropagator {
* Determines the change in rotation between two attached kinetic entities. For * Determines the change in rotation between two attached kinetic entities. For
* instance, an axis connection returns 1 while a 1-to-1 gear connection * instance, an axis connection returns 1 while a 1-to-1 gear connection
* reverses the rotation and therefore returns -1. * reverses the rotation and therefore returns -1.
* *
* @param from * @param from
* @param to * @param to
* @return * @return
@ -201,7 +201,7 @@ public class RotationPropagator {
/** /**
* Insert the added position to the kinetic network. * Insert the added position to the kinetic network.
* *
* @param worldIn * @param worldIn
* @param pos * @param pos
*/ */
@ -215,7 +215,7 @@ public class RotationPropagator {
/** /**
* Search for sourceless networks attached to the given entity and update them. * Search for sourceless networks attached to the given entity and update them.
* *
* @param currentTE * @param currentTE
*/ */
private static void propagateNewSource(KineticTileEntity currentTE) { private static void propagateNewSource(KineticTileEntity currentTE) {
@ -230,11 +230,14 @@ public class RotationPropagator {
if (newSpeed == 0 && oppositeSpeed == 0) if (newSpeed == 0 && oppositeSpeed == 0)
continue; continue;
boolean incompatible = boolean incompatible =
Math.signum(newSpeed) != Math.signum(speedOfNeighbour) && (newSpeed != 0 && speedOfNeighbour != 0); Math.signum(newSpeed) != Math.signum(speedOfNeighbour) && (newSpeed != 0 && speedOfNeighbour != 0);
boolean tooFast = Math.abs(newSpeed) > AllConfigs.SERVER.kinetics.maxRotationSpeed.get(); boolean tooFast = Math.abs(newSpeed) > AllConfigs.SERVER.kinetics.maxRotationSpeed.get()
|| Math.abs(oppositeSpeed) > AllConfigs.SERVER.kinetics.maxRotationSpeed.get();
// Check for both the new speed and the opposite speed, just in case
boolean speedChangedTooOften = currentTE.getFlickerScore() > MAX_FLICKER_SCORE; boolean speedChangedTooOften = currentTE.getFlickerScore() > MAX_FLICKER_SCORE;
if (tooFast || speedChangedTooOften) { if (tooFast || speedChangedTooOften) {
world.destroyBlock(pos, true); world.destroyBlock(pos, true);
@ -300,7 +303,7 @@ public class RotationPropagator {
/** /**
* Remove the given entity from the network. * Remove the given entity from the network.
* *
* @param worldIn * @param worldIn
* @param pos * @param pos
* @param removedTE * @param removedTE
@ -333,7 +336,7 @@ public class RotationPropagator {
/** /**
* Clear the entire subnetwork depending on the given entity and find a new * Clear the entire subnetwork depending on the given entity and find a new
* source * source
* *
* @param updateTE * @param updateTE
*/ */
private static void propagateMissingSource(KineticTileEntity updateTE) { private static void propagateMissingSource(KineticTileEntity updateTE) {